Merge branch 'fix-DblClick-after-dragging' of git://github.com/kzhdev/KineticJS into kzhdev-fix-DblClick-after-dragging

Conflicts:
	test/unit/Stage-test.js

src/DragAndDrop.js

@@ -3,6 +3,7 @@
         // properties
         anim: new Kinetic.Animation(),
         isDragging: false,
+        justDragged: false,
         offset: {
             x: 0,
             y: 0
@@ -60,6 +61,7 @@
                 // operation actually started.
                 if(dd.isDragging) {
                     dd.isDragging = false;
+                    dd.justDragged = true;
                     Kinetic.listenClickTap = false;
 
                     if (evt) {

src/Stage.js

@@ -460,17 +460,20 @@
         _mouseup: function(evt) {
             if (!Kinetic.UA.mobile) {
                 this._setPointerPosition(evt);
-                var that = this,
-                    shape = this.getIntersection(this.getPointerPosition()),
+                var shape = this.getIntersection(this.getPointerPosition()),
                     clickStartShape = this.clickStartShape,
-                    fireDblClick = false;
+                    fireDblClick = false,
+                    dd = Kinetic.DD;
 
                 if(Kinetic.inDblClickWindow) {
                     fireDblClick = true;
                     Kinetic.inDblClickWindow = false;
                 }
-                else {
+                // don't set inDblClickWindow after dragging
+                else if (!dd || !dd.justDragged) {
                     Kinetic.inDblClickWindow = true;
+                } else if (dd) {
+                    dd.justDragged = false;
                 }
 
                 setTimeout(function() {

test/unit/Stage-test.js

@@ -450,5 +450,71 @@ suite('Stage', function() {
         stage.add(layer1, layer2, layer3);
         assert.equal(stage.getLayers().length, 3, 'stage has exactly three layers');
     });
+    // ======================================================
+    test('test drag and click', function() {
+        var stage = addStage();
+        var layer = new Kinetic.Layer();
+        var rect = new Kinetic.Rect({
+            x: 50,
+            y: 50,
+            width: 50,
+            height: 50,
+            fill: 'red',
+            draggable: true
+        });
 
+        layer.add(rect);
+        stage.add(layer);
+
+        rect.on('dblclick', function() {
+            assert(false, 'double click fired');
+        });
+
+        var top = stage.content.getBoundingClientRect().top,
+            clientY = 60 + top;
+
+        // simulate dragging
+        stage._mousedown({
+            clientX: 60,
+            clientY: clientY
+        });
+
+        stage._mousemove({
+            clientX: 61,
+            clientY: clientY
+        });
+
+        stage._mousemove({
+            clientX: 62,
+            clientY: clientY
+        });
+
+        stage._mousemove({
+            clientX: 63,
+            clientY: clientY
+        });
+
+        stage._mousemove({
+            clientX: 64,
+            clientY: clientY
+        });
+
+        Kinetic.DD._endDragBefore();
+        stage._mouseup({
+            clientX: 65,
+            clientY: clientY
+        });
+        Kinetic.DD._endDragAfter({dragEndNode:rect});
+
+        // simulate click
+        stage._mousedown({
+            clientX: 66,
+            clientY: clientY
+        });
+
+        stage._mouseup({
+            clientX: 66,
+            clientY: clientY
+        });
+    })
 });