From dc107a06ae7c20193514ec2bb8b029ecc2663ea6 Mon Sep 17 00:00:00 2001 From: Eric Rowell Date: Sun, 24 Mar 2013 20:54:59 -0700 Subject: [PATCH] fixed small logical error with startDrag() --- src/DragAndDrop.js | 6 +++++- src/Stage.js | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/DragAndDrop.js b/src/DragAndDrop.js index e8ac168d..b1182d38 100644 --- a/src/DragAndDrop.js +++ b/src/DragAndDrop.js @@ -93,7 +93,11 @@ ap = this.getAbsolutePosition(), animNode = layer || this; - if(pos && !dd.node) { + if(pos) { + if (dd.node) { + dd.node.stopDrag(); + } + dd.node = this; dd.offset.x = pos.x - ap.x; dd.offset.y = pos.y - ap.y; diff --git a/src/Stage.js b/src/Stage.js index d8cf147a..c0ffbe70 100644 --- a/src/Stage.js +++ b/src/Stage.js @@ -425,7 +425,7 @@ } //init stage drag and drop - if(this.isDraggable()) { + if(this.isDraggable() && !dd.node) { this.startDrag(evt); } },