diff --git a/src/Container.js b/src/Container.js
index 7bc0f8e5..0dedb0e8 100644
--- a/src/Container.js
+++ b/src/Container.js
@@ -88,21 +88,21 @@
* @param {String} selector
* @example
* // select node with id foo
- * var node = stage.get('#foo');
+ * var node = stage.find('#foo');
*
* // select nodes with name bar inside layer
- * var nodes = layer.get('.bar');
+ * var nodes = layer.find('.bar');
*
* // select all groups inside layer
- * var nodes = layer.get('Group');
+ * var nodes = layer.find('Group');
*
* // select all rectangles inside layer
- * var nodes = layer.get('Rect');
+ * var nodes = layer.find('Rect');
*
* // select node with an id of foo or a name of bar inside layer
- * var nodes = layer.get('#foo, .bar');
+ * var nodes = layer.find('#foo, .bar');
*/
- get: function(selector) {
+ find: function(selector) {
var retArr = [],
selectorArr = selector.replace(/ /g, '').split(','),
len = selectorArr.length,
@@ -137,7 +137,7 @@
},
_getNodeById: function(key) {
var node = Kinetic.ids[key];
-
+
if(node !== undefined && this.isAncestorOf(node)) {
return node;
}
@@ -222,7 +222,7 @@
getAllIntersections: function() {
var pos = Kinetic.Util._getXY(Array.prototype.slice.call(arguments));
var arr = [];
- var shapes = this.get('Shape');
+ var shapes = this.find('Shape');
var len = shapes.length;
for(var n = 0; n < len; n++) {
@@ -293,6 +293,8 @@
});
Kinetic.Util.extend(Kinetic.Container, Kinetic.Node);
+ // deprecated methods
+ Kinetic.Container.prototype.get = Kinetic.Container.prototype.find;
// add getters setters
Kinetic.Factory.addBoxGetterSetter(Kinetic.Container, 'clip');
diff --git a/src/plugins/Label.js b/src/plugins/Label.js
index 69137e21..fd1f6eb0 100644
--- a/src/plugins/Label.js
+++ b/src/plugins/Label.js
@@ -74,7 +74,7 @@
* @memberof Kinetic.Label.prototype
*/
getText: function() {
- return this.get('Text')[0];
+ return this.find('Text')[0];
},
/**
* get Tag shape for the label. You need to access the Tag shape in order to update
@@ -84,7 +84,7 @@
* @memberof Kinetic.Label.prototype
*/
getTag: function() {
- return this.get('Tag')[0];
+ return this.find('Tag')[0];
},
_addListeners: function(text) {
var that = this,
diff --git a/test/unit/Container-test.js b/test/unit/Container-test.js
index f22d2fb7..c7318c16 100644
--- a/test/unit/Container-test.js
+++ b/test/unit/Container-test.js
@@ -195,13 +195,13 @@ suite('Container', function() {
stage.add(layer);
var node;
- node = stage.get('#myCircle')[0];
+ node = stage.find('#myCircle')[0];
assert.equal(node.className, 'Circle', 'className should be Circle');
- node = layer.get('.myRect')[0];
+ node = layer.find('.myRect')[0];
assert.equal(node.className, 'Rect', 'className should be rect');
- node = layer.get('#myLayer')[0];
+ node = layer.find('#myLayer')[0];
assert.equal(node, undefined, 'node should be undefined');
- node = stage.get('#myLayer')[0];
+ node = stage.find('#myLayer')[0];
assert.equal(node.nodeType, 'Layer', 'node type should be Layer');
});
@@ -237,15 +237,15 @@ suite('Container', function() {
layer.add(rect);
stage.add(layer);
- assert.equal(layer.get('#myCircle, .myRect').length, 2, 'should be 2 items in the array');
- assert.equal(layer.get('#myCircle, .myRect')[0]._id, circle._id, 'circle id is wrong');
- assert.equal(layer.get('#myCircle, .myRect')[1]._id, rect._id, 'rect id is wrong');
+ assert.equal(layer.find('#myCircle, .myRect').length, 2, 'should be 2 items in the array');
+ assert.equal(layer.find('#myCircle, .myRect')[0]._id, circle._id, 'circle id is wrong');
+ assert.equal(layer.find('#myCircle, .myRect')[1]._id, rect._id, 'rect id is wrong');
- assert.equal(layer.get('#myCircle, Circle, .myRect, Rect').length, 4, 'should be 4 items in the array');
- assert.equal(layer.get('#myCircle, Circle, .myRect, Rect')[0]._id, circle._id, 'circle id is wrong');
- assert.equal(layer.get('#myCircle, Circle, .myRect, Rect')[1]._id, circle._id, 'circle id is wrong');
- assert.equal(layer.get('#myCircle, Circle, .myRect, Rect')[2]._id, rect._id, 'rect id is wrong');
- assert.equal(layer.get('#myCircle, Circle, .myRect, Rect')[3]._id, rect._id, 'rect id is wrong');
+ assert.equal(layer.find('#myCircle, Circle, .myRect, Rect').length, 4, 'should be 4 items in the array');
+ assert.equal(layer.find('#myCircle, Circle, .myRect, Rect')[0]._id, circle._id, 'circle id is wrong');
+ assert.equal(layer.find('#myCircle, Circle, .myRect, Rect')[1]._id, circle._id, 'circle id is wrong');
+ assert.equal(layer.find('#myCircle, Circle, .myRect, Rect')[2]._id, rect._id, 'rect id is wrong');
+ assert.equal(layer.find('#myCircle, Circle, .myRect, Rect')[3]._id, rect._id, 'rect id is wrong');
});
@@ -278,7 +278,7 @@ suite('Container', function() {
layer.add(rect);
stage.add(layer);
- var shapes = layer.get('.myShape');
+ var shapes = layer.find('.myShape');
assert.equal(shapes.length, 2, 'shapes array should have 2 elements');
@@ -322,7 +322,7 @@ suite('Container', function() {
layer.add(rect);
stage.add(layer);
- var shapes = layer.get('Shape');
+ var shapes = layer.find('Shape');
assert.equal(shapes.length, 2, 'shapes array should have 2 elements');
@@ -366,7 +366,7 @@ suite('Container', function() {
layer.add(rect);
stage.add(layer);
- var shapes = layer.get('.myShape');
+ var shapes = layer.find('.myShape');
assert.equal(shapes.length, 2, 'shapes array should have 2 elements');
var a = 0;
@@ -613,23 +613,23 @@ suite('Container', function() {
stage.add(layer);
stage.add(fooLayer);
- assert.equal(stage.get('Shape').length, 2, 'stage should have 2 shapes');
- assert.equal(layer.get('Shape').length, 2, 'layer should have 2 shapes');
- assert.equal(group.get('Shape').length, 1, 'layer should have 2 shapes');
+ assert.equal(stage.find('Shape').length, 2, 'stage should have 2 shapes');
+ assert.equal(layer.find('Shape').length, 2, 'layer should have 2 shapes');
+ assert.equal(group.find('Shape').length, 1, 'layer should have 2 shapes');
- assert.equal(stage.get('Layer').length, 2, 'stage should have 2 layers');
- assert.equal(stage.get('Group').length, 1, 'stage should have 1 group');
+ assert.equal(stage.find('Layer').length, 2, 'stage should have 2 layers');
+ assert.equal(stage.find('Group').length, 1, 'stage should have 1 group');
- assert.equal(layer.get('Group').length, 1, 'layer should have 1 group');
- assert.equal(layer.get('Shape').length, 2, 'layer should have 2 shapes');
- assert.equal(layer.get('Layer').length, 0, 'layer should have 0 layers');
+ assert.equal(layer.find('Group').length, 1, 'layer should have 1 group');
+ assert.equal(layer.find('Shape').length, 2, 'layer should have 2 shapes');
+ assert.equal(layer.find('Layer').length, 0, 'layer should have 0 layers');
- assert.equal(fooLayer.get('Group').length, 0, 'layer should have 0 groups');
- assert.equal(fooLayer.get('Shape').length, 0, 'layer should have 0 shapes');
+ assert.equal(fooLayer.find('Group').length, 0, 'layer should have 0 groups');
+ assert.equal(fooLayer.find('Shape').length, 0, 'layer should have 0 shapes');
- assert.equal(group.get('Shape').length, 1, 'group should have 1 shape');
- assert.equal(group.get('Layer').length, 0, 'group should have 0 layers');
- assert.equal(group.get('Group').length, 0, 'group should have 0 groups');
+ assert.equal(group.find('Shape').length, 1, 'group should have 1 shape');
+ assert.equal(group.find('Layer').length, 0, 'group should have 0 layers');
+ assert.equal(group.find('Group').length, 0, 'group should have 0 groups');
});
@@ -727,45 +727,45 @@ suite('Container', function() {
stage.add(layer2);
stage.add(fooLayer);
- assert.equal(stage.get('Shape').length, 8, 'stage should have 5 shapes');
- assert.equal(stage.get('Layer').length, 3, 'stage should have 2 layers');
- assert.equal(stage.get('Group').length, 1, 'stage should have 1 group');
- assert.equal(stage.get('Rect').length, 3, 'stage should have 3 rects');
- assert.equal(stage.get('Circle').length, 2, 'stage should have 2 circles');
- assert.equal(stage.get('RegularPolygon').length, 1, 'stage should have 1 regular polygon');
- assert.equal(stage.get('TextPath').length, 1, 'stage should have 1 text path');
- assert.equal(stage.get('Path').length, 1, 'stage should have 1 path');
+ assert.equal(stage.find('Shape').length, 8, 'stage should have 5 shapes');
+ assert.equal(stage.find('Layer').length, 3, 'stage should have 2 layers');
+ assert.equal(stage.find('Group').length, 1, 'stage should have 1 group');
+ assert.equal(stage.find('Rect').length, 3, 'stage should have 3 rects');
+ assert.equal(stage.find('Circle').length, 2, 'stage should have 2 circles');
+ assert.equal(stage.find('RegularPolygon').length, 1, 'stage should have 1 regular polygon');
+ assert.equal(stage.find('TextPath').length, 1, 'stage should have 1 text path');
+ assert.equal(stage.find('Path').length, 1, 'stage should have 1 path');
- assert.equal(layer.get('Shape').length, 5, 'layer should have 5 shapes');
- assert.equal(layer.get('Layer').length, 0, 'layer should have 0 layers');
- assert.equal(layer.get('Group').length, 1, 'layer should have 1 group');
- assert.equal(layer.get('Rect').length, 3, 'layer should have 3 rects');
- assert.equal(layer.get('Circle').length, 2, 'layer should have 2 circles');
- assert.equal(layer.get('RegularPolygon').length, 0, 'layer should have 0 regular polygon');
- assert.equal(layer.get('TextPath').length, 0, 'layer should have 0 text path');
- assert.equal(layer.get('Path').length, 0, 'layer should have 0 path');
+ assert.equal(layer.find('Shape').length, 5, 'layer should have 5 shapes');
+ assert.equal(layer.find('Layer').length, 0, 'layer should have 0 layers');
+ assert.equal(layer.find('Group').length, 1, 'layer should have 1 group');
+ assert.equal(layer.find('Rect').length, 3, 'layer should have 3 rects');
+ assert.equal(layer.find('Circle').length, 2, 'layer should have 2 circles');
+ assert.equal(layer.find('RegularPolygon').length, 0, 'layer should have 0 regular polygon');
+ assert.equal(layer.find('TextPath').length, 0, 'layer should have 0 text path');
+ assert.equal(layer.find('Path').length, 0, 'layer should have 0 path');
- assert.equal(layer2.get('Shape').length, 3, 'layer2 should have 3 shapes');
- assert.equal(layer2.get('Layer').length, 0, 'layer2 should have 0 layers');
- assert.equal(layer2.get('Group').length, 0, 'layer2 should have 0 group');
- assert.equal(layer2.get('RegularPolygon').length, 1, 'layer2 should have 1 regular polygon');
- assert.equal(layer2.get('TextPath').length, 1, 'layer2 should have 1 text path');
- assert.equal(layer2.get('Path').length, 1, 'layer2 should have 1 path');
+ assert.equal(layer2.find('Shape').length, 3, 'layer2 should have 3 shapes');
+ assert.equal(layer2.find('Layer').length, 0, 'layer2 should have 0 layers');
+ assert.equal(layer2.find('Group').length, 0, 'layer2 should have 0 group');
+ assert.equal(layer2.find('RegularPolygon').length, 1, 'layer2 should have 1 regular polygon');
+ assert.equal(layer2.find('TextPath').length, 1, 'layer2 should have 1 text path');
+ assert.equal(layer2.find('Path').length, 1, 'layer2 should have 1 path');
- assert.equal(fooLayer.get('Shape').length, 0, 'layer should have 0 shapes');
- assert.equal(fooLayer.get('Group').length, 0, 'layer should have 0 groups');
- assert.equal(fooLayer.get('Rect').length, 0, 'layer should have 0 rects');
- assert.equal(fooLayer.get('Circle').length, 0, 'layer should have 0 circles');
+ assert.equal(fooLayer.find('Shape').length, 0, 'layer should have 0 shapes');
+ assert.equal(fooLayer.find('Group').length, 0, 'layer should have 0 groups');
+ assert.equal(fooLayer.find('Rect').length, 0, 'layer should have 0 rects');
+ assert.equal(fooLayer.find('Circle').length, 0, 'layer should have 0 circles');
- assert.equal(group.get('Shape').length, 2, 'group should have 2 shape');
- assert.equal(group.get('Layer').length, 0, 'group should have 0 layers');
- assert.equal(group.get('Group').length, 0, 'group should have 0 groups');
- assert.equal(group.get('Rect').length, 1, 'group should have 1 rects');
- assert.equal(group.get('Circle').length, 1, 'gropu should have 1 circles');
+ assert.equal(group.find('Shape').length, 2, 'group should have 2 shape');
+ assert.equal(group.find('Layer').length, 0, 'group should have 0 layers');
+ assert.equal(group.find('Group').length, 0, 'group should have 0 groups');
+ assert.equal(group.find('Rect').length, 1, 'group should have 1 rects');
+ assert.equal(group.find('Circle').length, 1, 'gropu should have 1 circles');
});
// ======================================================
- test('test get() selector by adding shape, then group, then layer', function() {
+ test('test find() selector by adding shape, then group, then layer', function() {
var stage = addStage();
var layer = new Kinetic.Layer({
name: 'layerName',
@@ -791,24 +791,67 @@ suite('Container', function() {
layer.add(group);
stage.add(layer);
- assert.equal(stage.get('.rectName')[0].attrs.id, 'rectId', 'problem with shape name selector');
- assert.equal(stage.get('#rectId')[0].attrs.id, 'rectId', 'problem with shape id selector');
- assert.equal(layer.get('.rectName')[0].attrs.id, 'rectId', 'problem with shape name selector');
- assert.equal(layer.get('#rectId')[0].attrs.id, 'rectId', 'problem with shape id selector');
- assert.equal(group.get('.rectName')[0].attrs.id, 'rectId', 'problem with shape name selector');
- assert.equal(group.get('#rectId')[0].attrs.id, 'rectId', 'problem with shape id selector');
+ assert.equal(stage.find('.rectName')[0].attrs.id, 'rectId', 'problem with shape name selector');
+ assert.equal(stage.find('#rectId')[0].attrs.id, 'rectId', 'problem with shape id selector');
+ assert.equal(layer.find('.rectName')[0].attrs.id, 'rectId', 'problem with shape name selector');
+ assert.equal(layer.find('#rectId')[0].attrs.id, 'rectId', 'problem with shape id selector');
+ assert.equal(group.find('.rectName')[0].attrs.id, 'rectId', 'problem with shape name selector');
+ assert.equal(group.find('#rectId')[0].attrs.id, 'rectId', 'problem with shape id selector');
- assert.equal(stage.get('.groupName')[0].attrs.id, 'groupId', 'problem with group name selector');
- assert.equal(stage.get('#groupId')[0].attrs.id, 'groupId', 'problem with group id selector');
- assert.equal(layer.get('.groupName')[0].attrs.id, 'groupId', 'problem with group name selector');
- assert.equal(layer.get('#groupId')[0].attrs.id, 'groupId', 'problem with group id selector');
+ assert.equal(stage.find('.groupName')[0].attrs.id, 'groupId', 'problem with group name selector');
+ assert.equal(stage.find('#groupId')[0].attrs.id, 'groupId', 'problem with group id selector');
+ assert.equal(layer.find('.groupName')[0].attrs.id, 'groupId', 'problem with group name selector');
+ assert.equal(layer.find('#groupId')[0].attrs.id, 'groupId', 'problem with group id selector');
- assert.equal(stage.get('.layerName')[0].attrs.id, 'layerId', 'problem with layer name selector');
- assert.equal(stage.get('#layerId')[0].attrs.id, 'layerId', 'problem with layer id selector');
+ assert.equal(stage.find('.layerName')[0].attrs.id, 'layerId', 'problem with layer name selector');
+ assert.equal(stage.find('#layerId')[0].attrs.id, 'layerId', 'problem with layer id selector');
});
// ======================================================
- test('test get() selector by adding group, then shape, then layer', function() {
+ test('test find() selector by adding group, then shape, then layer', function() {
+ var stage = addStage();
+ var layer = new Kinetic.Layer({
+ name: 'layerName',
+ id: 'layerId'
+ });
+ var group = new Kinetic.Group({
+ name: 'groupName',
+ id: 'groupId'
+ });
+ var rect = new Kinetic.Rect({
+ x: 200,
+ y: 20,
+ width: 100,
+ height: 50,
+ fill: 'red',
+ stroke: 'black',
+ strokeWidth: 4,
+ name: 'rectName',
+ id: 'rectId'
+ });
+
+ layer.add(group);
+ group.add(rect);
+ stage.add(layer);
+
+ assert.equal(stage.find('.rectName')[0].attrs.id, 'rectId', 'problem with shape name selector');
+ assert.equal(stage.find('#rectId')[0].attrs.id, 'rectId', 'problem with shape id selector');
+ assert.equal(layer.find('.rectName')[0].attrs.id, 'rectId', 'problem with shape name selector');
+ assert.equal(layer.find('#rectId')[0].attrs.id, 'rectId', 'problem with shape id selector');
+ assert.equal(group.find('.rectName')[0].attrs.id, 'rectId', 'problem with shape name selector');
+ assert.equal(group.find('#rectId')[0].attrs.id, 'rectId', 'problem with shape id selector');
+
+ assert.equal(stage.find('.groupName')[0].attrs.id, 'groupId', 'problem with group name selector');
+ assert.equal(stage.find('#groupId')[0].attrs.id, 'groupId', 'problem with group id selector');
+ assert.equal(layer.find('.groupName')[0].attrs.id, 'groupId', 'problem with group name selector');
+ assert.equal(layer.find('#groupId')[0].attrs.id, 'groupId', 'problem with group id selector');
+
+ assert.equal(stage.find('.layerName')[0].attrs.id, 'layerId', 'problem with layer name selector');
+ assert.equal(stage.find('#layerId')[0].attrs.id, 'layerId', 'problem with layer id selector');
+ });
+
+ // ======================================================
+ test('test deprecated get() method', function() {
var stage = addStage();
var layer = new Kinetic.Layer({
name: 'layerName',
@@ -835,23 +878,10 @@ suite('Container', function() {
stage.add(layer);
assert.equal(stage.get('.rectName')[0].attrs.id, 'rectId', 'problem with shape name selector');
- assert.equal(stage.get('#rectId')[0].attrs.id, 'rectId', 'problem with shape id selector');
- assert.equal(layer.get('.rectName')[0].attrs.id, 'rectId', 'problem with shape name selector');
- assert.equal(layer.get('#rectId')[0].attrs.id, 'rectId', 'problem with shape id selector');
- assert.equal(group.get('.rectName')[0].attrs.id, 'rectId', 'problem with shape name selector');
- assert.equal(group.get('#rectId')[0].attrs.id, 'rectId', 'problem with shape id selector');
-
- assert.equal(stage.get('.groupName')[0].attrs.id, 'groupId', 'problem with group name selector');
- assert.equal(stage.get('#groupId')[0].attrs.id, 'groupId', 'problem with group id selector');
- assert.equal(layer.get('.groupName')[0].attrs.id, 'groupId', 'problem with group name selector');
- assert.equal(layer.get('#groupId')[0].attrs.id, 'groupId', 'problem with group id selector');
-
- assert.equal(stage.get('.layerName')[0].attrs.id, 'layerId', 'problem with layer name selector');
- assert.equal(stage.get('#layerId')[0].attrs.id, 'layerId', 'problem with layer id selector');
});
// ======================================================
- test('test get() selector by adding group, then layer, then shape', function() {
+ test('test find() selector by adding group, then layer, then shape', function() {
var stage = addStage();
var layer = new Kinetic.Layer({
name: 'layerName',
@@ -877,24 +907,24 @@ suite('Container', function() {
stage.add(layer);
group.add(rect);
- assert.equal(stage.get('.rectName')[0].attrs.id, 'rectId', 'problem with shape name selector');
- assert.equal(stage.get('#rectId')[0].attrs.id, 'rectId', 'problem with shape id selector');
- assert.equal(layer.get('.rectName')[0].attrs.id, 'rectId', 'problem with shape name selector');
- assert.equal(layer.get('#rectId')[0].attrs.id, 'rectId', 'problem with shape id selector');
- assert.equal(group.get('.rectName')[0].attrs.id, 'rectId', 'problem with shape name selector');
- assert.equal(group.get('#rectId')[0].attrs.id, 'rectId', 'problem with shape id selector');
+ assert.equal(stage.find('.rectName')[0].attrs.id, 'rectId', 'problem with shape name selector');
+ assert.equal(stage.find('#rectId')[0].attrs.id, 'rectId', 'problem with shape id selector');
+ assert.equal(layer.find('.rectName')[0].attrs.id, 'rectId', 'problem with shape name selector');
+ assert.equal(layer.find('#rectId')[0].attrs.id, 'rectId', 'problem with shape id selector');
+ assert.equal(group.find('.rectName')[0].attrs.id, 'rectId', 'problem with shape name selector');
+ assert.equal(group.find('#rectId')[0].attrs.id, 'rectId', 'problem with shape id selector');
- assert.equal(stage.get('.groupName')[0].attrs.id, 'groupId', 'problem with group name selector');
- assert.equal(stage.get('#groupId')[0].attrs.id, 'groupId', 'problem with group id selector');
- assert.equal(layer.get('.groupName')[0].attrs.id, 'groupId', 'problem with group name selector');
- assert.equal(layer.get('#groupId')[0].attrs.id, 'groupId', 'problem with group id selector');
+ assert.equal(stage.find('.groupName')[0].attrs.id, 'groupId', 'problem with group name selector');
+ assert.equal(stage.find('#groupId')[0].attrs.id, 'groupId', 'problem with group id selector');
+ assert.equal(layer.find('.groupName')[0].attrs.id, 'groupId', 'problem with group name selector');
+ assert.equal(layer.find('#groupId')[0].attrs.id, 'groupId', 'problem with group id selector');
- assert.equal(stage.get('.layerName')[0].attrs.id, 'layerId', 'problem with layer name selector');
- assert.equal(stage.get('#layerId')[0].attrs.id, 'layerId', 'problem with layer id selector');
+ assert.equal(stage.find('.layerName')[0].attrs.id, 'layerId', 'problem with layer name selector');
+ assert.equal(stage.find('#layerId')[0].attrs.id, 'layerId', 'problem with layer id selector');
});
// ======================================================
- test('test get() selector by adding layer, then group, then shape', function() {
+ test('test find() selector by adding layer, then group, then shape', function() {
var stage = addStage();
var layer = new Kinetic.Layer({
name: 'layerName',
@@ -920,20 +950,20 @@ suite('Container', function() {
layer.add(group);
group.add(rect);
- assert.equal(stage.get('.rectName')[0].attrs.id, 'rectId', 'problem with shape name selector');
- assert.equal(stage.get('#rectId')[0].attrs.id, 'rectId', 'problem with shape id selector');
- assert.equal(layer.get('.rectName')[0].attrs.id, 'rectId', 'problem with shape name selector');
- assert.equal(layer.get('#rectId')[0].attrs.id, 'rectId', 'problem with shape id selector');
- assert.equal(group.get('.rectName')[0].attrs.id, 'rectId', 'problem with shape name selector');
- assert.equal(group.get('#rectId')[0].attrs.id, 'rectId', 'problem with shape id selector');
+ assert.equal(stage.find('.rectName')[0].attrs.id, 'rectId', 'problem with shape name selector');
+ assert.equal(stage.find('#rectId')[0].attrs.id, 'rectId', 'problem with shape id selector');
+ assert.equal(layer.find('.rectName')[0].attrs.id, 'rectId', 'problem with shape name selector');
+ assert.equal(layer.find('#rectId')[0].attrs.id, 'rectId', 'problem with shape id selector');
+ assert.equal(group.find('.rectName')[0].attrs.id, 'rectId', 'problem with shape name selector');
+ assert.equal(group.find('#rectId')[0].attrs.id, 'rectId', 'problem with shape id selector');
- assert.equal(stage.get('.groupName')[0].attrs.id, 'groupId', 'problem with group name selector');
- assert.equal(stage.get('#groupId')[0].attrs.id, 'groupId', 'problem with group id selector');
- assert.equal(layer.get('.groupName')[0].attrs.id, 'groupId', 'problem with group name selector');
- assert.equal(layer.get('#groupId')[0].attrs.id, 'groupId', 'problem with group id selector');
+ assert.equal(stage.find('.groupName')[0].attrs.id, 'groupId', 'problem with group name selector');
+ assert.equal(stage.find('#groupId')[0].attrs.id, 'groupId', 'problem with group id selector');
+ assert.equal(layer.find('.groupName')[0].attrs.id, 'groupId', 'problem with group name selector');
+ assert.equal(layer.find('#groupId')[0].attrs.id, 'groupId', 'problem with group id selector');
- assert.equal(stage.get('.layerName')[0].attrs.id, 'layerId', 'problem with layer name selector');
- assert.equal(stage.get('#layerId')[0].attrs.id, 'layerId', 'problem with layer id selector');
+ assert.equal(stage.find('.layerName')[0].attrs.id, 'layerId', 'problem with layer name selector');
+ assert.equal(stage.find('#layerId')[0].attrs.id, 'layerId', 'problem with layer id selector');
layer.draw();
});
diff --git a/test/unit/Node-test.js b/test/unit/Node-test.js
index bbe66f4d..42953981 100644
--- a/test/unit/Node-test.js
+++ b/test/unit/Node-test.js
@@ -152,7 +152,7 @@ suite('Node', function() {
});
layer.add(circle);
stage.add(layer);
-
+
// shadow cache
assert.equal(circle.cache.hasShadow, false);
circle.setShadowColor('red');
@@ -179,7 +179,7 @@ suite('Node', function() {
});
layer.add(circle);
stage.add(layer);
-
+
// opacity cache
assert.equal(circle.cache.absoluteOpacity, 1);
circle.setOpacity(0.5);
@@ -203,7 +203,7 @@ suite('Node', function() {
});
layer.add(circle);
stage.add(layer);
-
+
// listening cache
assert.equal(circle.cache.listening, true);
circle.setListening(false);
@@ -227,7 +227,7 @@ suite('Node', function() {
});
layer.add(circle);
stage.add(layer);
-
+
// stage cache
var st = circle.getStage();
assert.equal(circle.cache.stage._id, stage._id);
@@ -504,30 +504,30 @@ suite('Node', function() {
assert.equal(group.getChildren().length, 2);
assert.equal(clone.getChildren().length, 2);
- assert.equal(group.get('.myText')[0].getFill(), 'blue');
- assert.equal(clone.get('.myText')[0].getFill(), 'blue');
- clone.get('.myText')[0].setFill('black');
- assert.equal(group.get('.myRect')[0].attrs.myAttr, 'group rect');
- assert.equal(clone.get('.myRect')[0].attrs.myAttr, 'group rect');
- clone.get('.myRect')[0].setAttrs({
+ assert.equal(group.find('.myText')[0].getFill(), 'blue');
+ assert.equal(clone.find('.myText')[0].getFill(), 'blue');
+ clone.find('.myText')[0].setFill('black');
+ assert.equal(group.find('.myRect')[0].attrs.myAttr, 'group rect');
+ assert.equal(clone.find('.myRect')[0].attrs.myAttr, 'group rect');
+ clone.find('.myRect')[0].setAttrs({
myAttr: 'clone rect'
});
// Make sure that when we change a clone object attr that the rect object
// attr isn't updated by reference
- assert.equal(group.get('.myText')[0].getFill(), 'blue');
- assert.equal(clone.get('.myText')[0].getFill(), 'black');
+ assert.equal(group.find('.myText')[0].getFill(), 'blue');
+ assert.equal(clone.find('.myText')[0].getFill(), 'black');
- assert.equal(group.get('.myRect')[0].attrs.myAttr, 'group rect');
- assert.equal(clone.get('.myRect')[0].attrs.myAttr, 'clone rect');
+ assert.equal(group.find('.myRect')[0].attrs.myAttr, 'group rect');
+ assert.equal(clone.find('.myRect')[0].attrs.myAttr, 'clone rect');
// make sure private ids are different
assert.notEqual(group._id, clone._id);
// make sure childrens private ids are different
- assert.notEqual(group.get('.myRect')[0]._id, clone.get('.myRect')[0]._id);
- assert.notEqual(group.get('.myText')[0]._id, clone.get('.myText')[0]._id);
+ assert.notEqual(group.find('.myRect')[0]._id, clone.find('.myRect')[0]._id);
+ assert.notEqual(group.find('.myText')[0]._id, clone.find('.myText')[0]._id);
// test user event binding cloning
assert.equal(clicks.length, 0);
@@ -538,9 +538,9 @@ suite('Node', function() {
// test user event binding cloning on children
assert.equal(taps.length, 0);
- group.get('.myRect')[0].fire('tap');
+ group.find('.myRect')[0].fire('tap');
assert.equal(taps.toString(), 'group rect');
- clone.get('.myRect')[0].fire('tap');
+ clone.find('.myRect')[0].fire('tap');
assert.equal(taps.toString(), 'group rect,clone rect');
stage.draw();
@@ -2165,7 +2165,7 @@ suite('Node', function() {
var stage = Kinetic.Node.create(json, container);
- stage.get('#myTriangle').each(function(node) {
+ stage.find('#myTriangle').each(function(node) {
node.setDrawFunc(drawTriangle);
});
@@ -2211,7 +2211,7 @@ suite('Node', function() {
var stage = Kinetic.Node.create(json, container);
assert.equal(stage.toJSON(), json);
- stage.get('#darth').each(function(node) {
+ stage.find('#darth').each(function(node) {
node.setImage(imageObj);
});
stage.draw();
@@ -2293,7 +2293,7 @@ suite('Node', function() {
layer.add(circle);
- var node = stage.get('#myCircle')[0];
+ var node = stage.find('#myCircle')[0];
assert.equal(node, undefined);
@@ -2321,14 +2321,14 @@ suite('Node', function() {
stage.add(layer);
assert.equal(stage.children.length, 1);
- assert(stage.get('.myLayer')[0] !== undefined);
- assert(stage.get('.myCircle')[0] !== undefined);
+ assert(stage.find('.myLayer')[0] !== undefined);
+ assert(stage.find('.myCircle')[0] !== undefined);
layer.destroy();
assert.equal(stage.children.length, 0);
- assert.equal(stage.get('.myLayer')[0], undefined);
- assert.equal(stage.get('.myCircle')[0], undefined);
+ assert.equal(stage.find('.myLayer')[0], undefined);
+ assert.equal(stage.find('.myCircle')[0], undefined);
stage.draw();
});
@@ -2385,14 +2385,14 @@ suite('Node', function() {
stage.add(layer);
assert.equal(layer.getChildren().length, 1);
- assert(stage.get('.myGroup')[0] !== undefined);
- assert(stage.get('.myCircle')[0] !== undefined);
+ assert(stage.find('.myGroup')[0] !== undefined);
+ assert(stage.find('.myCircle')[0] !== undefined);
group.destroy();
assert.equal(layer.children.length, 0);
- assert.equal(stage.get('.myGroup')[0], undefined);
- assert.equal(stage.get('.myCircle')[0], undefined);
+ assert.equal(stage.find('.myGroup')[0], undefined);
+ assert.equal(stage.find('.myCircle')[0], undefined);
stage.draw();
});
diff --git a/test/unit/plugins/Label-test.js b/test/unit/plugins/Label-test.js
index 3c63c1d5..048b9b16 100644
--- a/test/unit/plugins/Label-test.js
+++ b/test/unit/plugins/Label-test.js
@@ -6,7 +6,7 @@ suite('Label', function() {
var label = new Kinetic.Label({
x: 100,
- y: 100,
+ y: 100,
draggable: true
});
@@ -31,7 +31,7 @@ suite('Label', function() {
fontSize: 50,
//fontFamily: 'Calibri',
//fontStyle: 'normal',
- lineHeight: 1.2,
+ lineHeight: 1.2,
//padding: 10,
fill: 'green'
}));
@@ -39,7 +39,7 @@ suite('Label', function() {
layer.add(label);
stage.add(layer);
-
+
var beforeTextWidth = label.getText().getWidth();
label.getText().setFontSize(100);
@@ -47,23 +47,23 @@ suite('Label', function() {
var afterTextWidth = label.getText().getWidth();
label.getText().setFontSize(50);
-
+
label.getText().setText('Hello big world');
layer.draw();
-
-
+
+
assert.equal(label.getType(), 'Group');
assert.equal(label.getClassName(), 'Label');
var json = label.toJSON();
//console.log(json);
- // use relaxed trace because text can be a slightly different size in different browsers,
+ // use relaxed trace because text can be a slightly different size in different browsers,
// resulting in slightly different tag dimensions
var relaxedTrace = layer.getContext().getTrace(true);
//console.log(relaxedTrace);
-
+
assert.equal(relaxedTrace, 'clearRect();save();lineJoin;transform();beginPath();moveTo();lineTo();lineTo();lineTo();lineTo();lineTo();lineTo();closePath();save();globalAlpha;shadowColor;shadowBlur;shadowOffsetX;shadowOffsetY;fillStyle;fill();restore();fillStyle;fill();lineWidth;strokeStyle;stroke();restore();save();transform();font;textBaseline;textAlign;save();translate();translate();save();fillStyle;fillText();restore();translate();restore();restore();clearRect();save();lineJoin;transform();beginPath();moveTo();lineTo();lineTo();lineTo();lineTo();lineTo();lineTo();closePath();save();globalAlpha;shadowColor;shadowBlur;shadowOffsetX;shadowOffsetY;fillStyle;fill();restore();fillStyle;fill();lineWidth;strokeStyle;stroke();restore();save();transform();font;textBaseline;textAlign;save();translate();translate();save();fillStyle;fillText();restore();translate();restore();restore();');
});
diff --git a/test/unit/shapes/Blob-test.js b/test/unit/shapes/Blob-test.js
index 5885ed3f..60270381 100644
--- a/test/unit/shapes/Blob-test.js
+++ b/test/unit/shapes/Blob-test.js
@@ -47,7 +47,7 @@ suite('Blob', function(){
var stage = addStage();
var layer = new Kinetic.Layer();
-
+
var blob = new Kinetic.Blob({
tension: 0.8,
points: [{
@@ -73,7 +73,7 @@ suite('Blob', function(){
layer.add(blob);
stage.add(layer);
- assert.equal(stage.get('Blob')[0].getPoints().length, 4);
+ assert.equal(stage.find('Blob')[0].getPoints().length, 4);
});