changed getIntersections() to getAllIntersections() to indicate that the method returns more than may be needed. Updatee docs, and clarified the differences between intersects(), getIntersection(), and getAllIntersections()

This commit is contained in:
Eric Rowell
2013-05-17 15:50:53 -07:00
parent 4d682529b6
commit 3433086079
6 changed files with 33 additions and 30 deletions

View File

@@ -77,7 +77,7 @@ Test.Modules.STAGE = {
test(stage.getContent().className === 'kineticjs-content', 'stage DOM class name is wrong');
},
'stage getIntersections()': function(containerId) {
'stage getAllIntersections()': function(containerId) {
var stage = new Kinetic.Stage({
container: containerId,
width: 578,
@@ -116,7 +116,7 @@ Test.Modules.STAGE = {
},
'test getIntersections': function(containerId) {
'test getAllIntersections': function(containerId) {
var stage = new Kinetic.Stage({
container: containerId,
width: 578,
@@ -150,50 +150,50 @@ Test.Modules.STAGE = {
stage.add(layer);
// test individual shapes
test(stage.getIntersections(266, 114).length === 1, '17) getIntersections should return one shape');
test(stage.getIntersections(266, 114)[0].getId() === 'greenCircle', '19) first intersection should be greenCircle');
test(stage.getAllIntersections(266, 114).length === 1, '17) getAllIntersections should return one shape');
test(stage.getAllIntersections(266, 114)[0].getId() === 'greenCircle', '19) first intersection should be greenCircle');
test(stage.getIntersections(414, 115).length === 1, '18) getIntersections should return one shape');
test(stage.getIntersections(414, 115)[0].getId() === 'redCircle', '20) first intersection should be redCircle');
test(stage.getAllIntersections(414, 115).length === 1, '18) getAllIntersections should return one shape');
test(stage.getAllIntersections(414, 115)[0].getId() === 'redCircle', '20) first intersection should be redCircle');
test(stage.getIntersections(350, 118).length === 2, '1) getIntersections should return two shapes');
test(stage.getIntersections(350, 118)[0].getId() === 'redCircle', '2) first intersection should be redCircle');
test(stage.getIntersections(350, 118)[1].getId() === 'greenCircle', '3) second intersection should be greenCircle');
test(stage.getAllIntersections(350, 118).length === 2, '1) getAllIntersections should return two shapes');
test(stage.getAllIntersections(350, 118)[0].getId() === 'redCircle', '2) first intersection should be redCircle');
test(stage.getAllIntersections(350, 118)[1].getId() === 'greenCircle', '3) second intersection should be greenCircle');
// hide green circle. make sure only red circle is in result set
greenCircle.hide();
layer.draw();
test(stage.getIntersections(350, 118).length === 1, '4) getIntersections should return one shape');
test(stage.getIntersections(350, 118)[0].getId() === 'redCircle', '5) first intersection should be redCircle');
test(stage.getAllIntersections(350, 118).length === 1, '4) getAllIntersections should return one shape');
test(stage.getAllIntersections(350, 118)[0].getId() === 'redCircle', '5) first intersection should be redCircle');
// show green circle again. make sure both circles are in result set
greenCircle.show();
layer.draw();
test(stage.getIntersections(350, 118).length === 2, '6) getIntersections should return two shapes');
test(stage.getIntersections(350, 118)[0].getId() === 'redCircle', '7) first intersection should be redCircle');
test(stage.getIntersections(350, 118)[1].getId() === 'greenCircle', '8) second intersection should be greenCircle');
test(stage.getAllIntersections(350, 118).length === 2, '6) getAllIntersections should return two shapes');
test(stage.getAllIntersections(350, 118)[0].getId() === 'redCircle', '7) first intersection should be redCircle');
test(stage.getAllIntersections(350, 118)[1].getId() === 'greenCircle', '8) second intersection should be greenCircle');
// hide red circle. make sure only green circle is in result set
redCircle.hide();
layer.draw();
test(stage.getIntersections(350, 118).length === 1, '9) getIntersections should return one shape');
test(stage.getIntersections(350, 118)[0].getId() === 'greenCircle', '10) first intersection should be greenCircle');
test(stage.getAllIntersections(350, 118).length === 1, '9) getAllIntersections should return one shape');
test(stage.getAllIntersections(350, 118)[0].getId() === 'greenCircle', '10) first intersection should be greenCircle');
// show red circle again. make sure both circles are in result set
redCircle.show();
layer.draw();
test(stage.getIntersections(350, 118).length === 2, '11) getIntersections should return two shapes');
test(stage.getIntersections(350, 118)[0].getId() === 'redCircle', '12) first intersection should be redCircle');
test(stage.getIntersections(350, 118)[1].getId() === 'greenCircle', '13) second intersection should be greenCircle');
test(stage.getAllIntersections(350, 118).length === 2, '11) getAllIntersections should return two shapes');
test(stage.getAllIntersections(350, 118)[0].getId() === 'redCircle', '12) first intersection should be redCircle');
test(stage.getAllIntersections(350, 118)[1].getId() === 'greenCircle', '13) second intersection should be greenCircle');
// test from layer
test(layer.getIntersections(350, 118).length === 2, '14) getIntersections should return two shapes');
test(layer.getIntersections(350, 118)[0].getId() === 'redCircle', '15) first intersection should be redCircle');
test(layer.getIntersections(350, 118)[1].getId() === 'greenCircle', '16) second intersection should be greenCircle');
test(layer.getAllIntersections(350, 118).length === 2, '14) getAllIntersections should return two shapes');
test(layer.getAllIntersections(350, 118)[0].getId() === 'redCircle', '15) first intersection should be redCircle');
test(layer.getAllIntersections(350, 118)[1].getId() === 'greenCircle', '16) second intersection should be greenCircle');
},
'scale stage after add layer': function(containerId) {