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

fixed drag and drop regression bug

Browse Source
This commit is contained in:
Eric Rowell
2013-03-24 18:17:58 -07:00
parent 08bac6dc89
commit 3c63b13c95
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/DragAndDrop.js
View File

@@ -93,7 +93,7 @@
ap = this.getAbsolutePosition(), ap = this.getAbsolutePosition(),
animNode = layer || this; animNode = layer || this;
if(pos) { if(pos && !dd.node) {
dd.node = this; dd.node = this;
dd.offset.x = pos.x - ap.x; dd.offset.x = pos.x - ap.x;
dd.offset.y = pos.y - ap.y; dd.offset.y = pos.y - ap.y;

2
src/Stage.js
View File

@@ -425,7 +425,7 @@
} }
//init stage drag and drop //init stage drag and drop
if(dd && !go.isDragging() && this.isDraggable()) { if(this.isDraggable()) {
this.startDrag(evt); this.startDrag(evt);
} }
}, },

12
tests/js/manualTests.js
View File

@@ -1355,12 +1355,13 @@ Test.Modules.DRAG_AND_DROP = {
'stage and shape draggable': function(containerId) { 'stage and shape draggable': function(containerId) {
var stage = new Kinetic.Stage({ var stage = new Kinetic.Stage({
container: containerId, container: containerId,
draggable: true,
width: 578, width: 578,
height: 200, height: 200
draggable: true });
var layer = new Kinetic.Layer({
draggable: true
}); });
var layer = new Kinetic.Layer();
var group = new Kinetic.Group();
var rect = new Kinetic.Rect({ var rect = new Kinetic.Rect({
x: 150, x: 150,
@@ -1369,8 +1370,7 @@ Test.Modules.DRAG_AND_DROP = {
height: 50, height: 50,
fill: 'red', fill: 'red',
stroke: 'black', stroke: 'black',
strokeWidth: 4, strokeWidth: 4
draggable: true,
}); });
var rect2 = new Kinetic.Rect({ var rect2 = new Kinetic.Rect({