dismiss HTML5 drag events with jQuery dragging

Fixes metafizzy#206
srgsanky · Jun 24, 2015 · 9553bd0 · 9553bd0
1 parent ae577f4
commit 9553bd0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,7 @@
 # Changelog
 
++ Fixed bug with HTML5 drag & drop. Fixed [#206](https://github.com/metafizzy/packery/issues/206)
+
 ### v1.4.1
 
 + Remove `instance` argument from `dragItemPositioned` and `fitComplete` events

diff --git a/js/packery.js b/js/packery.js
@@ -86,13 +86,23 @@ Packery.prototype._create = function() {
   };
 
   this.handleUIDraggable = {
-    start: function handleUIDraggableStart( event ) {
+    start: function handleUIDraggableStart( event, ui ) {
+      // HTML5 may trigger dragstart, dismiss HTML5 dragging
+      if ( !ui ) {
+        return;
+      }
       _this.itemDragStart( event.currentTarget );
     },
     drag: function handleUIDraggableDrag( event, ui ) {
+      if ( !ui ) {
+        return;
+      }
       _this.itemDragMove( event.currentTarget, ui.position.left, ui.position.top );
     },
-    stop: function handleUIDraggableStop( event ) {
+    stop: function handleUIDraggableStop( event, ui ) {
+      if ( !ui ) {
+        return;
+      }
       _this.itemDragEnd( event.currentTarget );
     }
   };