lsm/konva
1
0
Fork 0
mirror of https://github.com/konvajs/konva.git synced 2025-09-19 02:37:59 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

drag and drop now ends whenever a mouseup or touchend event is detected anywhere on the page

Browse Source
This commit is contained in:
Eric Rowell
2013-01-27 22:25:16 -08:00
parent be295992e0
commit 1bcdd15f45
3 changed files with 51 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
tests/js/functionalTests.js
View File

@@ -1,13 +1,13 @@
Test.Modules.DD = {
'remove shape with onclick': function(containerId) {
'remove shape with onclick': function(containerId) {
var stage = new Kinetic.Stage({
container: containerId,
width: 578,
height: 200
});
var top = stage.content.getBoundingClientRect().top;
var layer = new Kinetic.Layer();
var circle = new Kinetic.Circle({
@@ -23,12 +23,17 @@ Test.Modules.DD = {
layer.add(circle);
stage.add(layer);
function remove() {
circle.remove();
layer.draw();
warn(layer.toDataURL() === dataUrls['cleared'], 'canvas should be cleared after removing shape onclick');
}
circle.on('click', function() {
this.remove();
layer.draw();
setTimeout(remove, 0);
});
stage._mousedown({
clientX: 291,
clientY: 112 + top
@@ -37,9 +42,9 @@ Test.Modules.DD = {
clientX: 291,
clientY: 112 + top
});
warn(layer.toDataURL() === dataUrls['cleared'], 'canvas should be cleared after removing shape onclick');
// end drag is tied to document mouseup and touchend event
// which can't be simulated. call _endDrag manually
Kinetic.DD._endDrag();
},
'test dragstart, dragmove, dragend': function(containerId) {
var stage = new Kinetic.Stage({
@@ -80,7 +85,7 @@ Test.Modules.DD = {
circle.on('dragend', function() {
dragEnd = true;
// test set draggable false after drag end
this.setDraggable(false);
this.setDraggable(false);
});
warn(layer.toDataURL() === dataUrls['drag circle before'], 'start data url is incorrect');
/*
@@ -109,6 +114,9 @@ Test.Modules.DD = {
clientX: 100,
clientY: 98 + top
});
// end drag is tied to document mouseup and touchend event
// which can't be simulated. call _endDrag manually
Kinetic.DD._endDrag();
test(dragStart, 'dragstart event was not triggered');
test(dragMove, 'dragmove event was not triggered');
@@ -177,6 +185,9 @@ Test.Modules.DD = {
clientX: 100,
clientY: 100 + top
});
// end drag is tied to document mouseup and touchend event
// which can't be simulated. call _endDrag manually
Kinetic.DD._endDrag();
test(circle.getPosition().x === 380, 'circle x should be 380');
test(circle.getPosition().y === 100, 'circle y should be 100');
@@ -243,6 +254,10 @@ Test.Modules.DD = {
clientX: 210,
clientY: 109 + top
});
// end drag is tied to document mouseup and touchend event
// which can't be simulated. call _endDrag manually
Kinetic.DD._endDrag();
//console.log(layer.toDataURL())
warn(layer.toDataURL() === dataUrls['drag layer after'], 'end data url is incorrect');
@@ -458,6 +473,9 @@ Test.Modules.EVENT = {
clientX: 290,
clientY: 100 + top
});
// end drag is tied to document mouseup and touchend event
// which can't be simulated. call _endDrag manually
Kinetic.DD._endDrag();
test(mouseover, '4) mouseover should be true');
test(mousemove, '4) mousemove should be true');
@@ -486,6 +504,9 @@ Test.Modules.EVENT = {
clientX: 290,
clientY: 100 + top
});
// end drag is tied to document mouseup and touchend event
// which can't be simulated. call _endDrag manually
Kinetic.DD._endDrag();
test(mouseover, '6) mouseover should be true');
test(mousemove, '6) mousemove should be true');
@@ -540,6 +561,9 @@ Test.Modules.EVENT = {
preventDefault: function() {
}
});
// end drag is tied to document mouseup and touchend event
// which can't be simulated. call _endDrag manually
Kinetic.DD._endDrag();
test(touchstart, '9) touchstart should be true');
test(!touchmove, '9) touchmove should be false');
@@ -568,6 +592,9 @@ Test.Modules.EVENT = {
preventDefault: function() {
}
});
// end drag is tied to document mouseup and touchend event
// which can't be simulated. call _endDrag manually
Kinetic.DD._endDrag();
test(touchstart, '11) touchstart should be true');
test(!touchmove, '11) touchmove should be false');
@@ -892,6 +919,9 @@ Test.Modules.EVENT = {
clientX: 374,
clientY: 114 + top
});
// end drag is tied to document mouseup and touchend event
// which can't be simulated. call _endDrag manually
Kinetic.DD._endDrag();
test(e.toString() === 'circle,group1,group2,layer,stage', 'problem with event bubbling');
}