Merge branch 'master' into snap-restrict-element-rect

taye · taye · commit 03cd9956824f · 2014-09-03T15:48:17.000+01:00
diff --git a/interact.js b/interact.js
@@ -1232,7 +1232,7 @@
     // Collect a new set of possible drops and save them in activeDrops.
     // setActiveDrops should always be called when a drag has just started or a
     // drag event happens while dynamicDrop is true
-    function setActiveDrops (dragElement) {
+    function setActiveDrops (event, dragElement) {
         // get dropzones and their elements that could recieve the draggable
         var possibleDrops = collectDrops(event, dragElement, true);
 
@@ -1249,7 +1249,7 @@
         var validDrops = [];
 
         if (dynamicDrop) {
-            setActiveDrops(dragElement);
+            setActiveDrops(event, dragElement);
         }
 
         // collect all dropzones and their elements which qualify for a drop
@@ -2485,7 +2485,7 @@
         activeDrops.rects     = [];
 
         if (!dynamicDrop) {
-            setActiveDrops(target._element);
+            setActiveDrops(event, target._element);
         }
 
         return dragEvent;
