Changeset 12525 for trunk/themes/default/js/ui/jquery.ui.droppable.js

Timestamp:

Oct 28, 2011, 3:25:54 PM (12 years ago)

Author:

patdenice

Message:

feature:2487
Update jQuery to 1.6.4 and jQuery UI to 1.8.16

File:

• trunk/themes/default/js/ui/jquery.ui.droppable.js (modified) (5 diffs)

trunk/themes/default/js/ui/jquery.ui.droppable.js

@@ -1 +1 @@
 /*
- * jQuery UI Droppable 1.8.10
+ * jQuery UI Droppable 1.8.16
  *
  * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
@@ -148 +148 @@
 
 $.extend($.ui.droppable, {
-        version: "1.8.10"
+        version: "1.8.16"
 });
 
@@ -213 +213 @@
                         m[i].visible = m[i].element.css("display") != "none"; if(!m[i].visible) continue;                                                                       //If the element is not visible, continue
 
+                        if(type == "mousedown") m[i]._activate.call(m[i], event); //Activate the droppable if used directly from draggables
+
                         m[i].offset = m[i].element.offset();
                         m[i].proportions = { width: m[i].element[0].offsetWidth, height: m[i].element[0].offsetHeight };
-
-                        if(type == "mousedown") m[i]._activate.call(m[i], event); //Activate the droppable if used directly from draggables
 
                 }
@@ -238 +238 @@
                 return dropped;
 
+        },
+        dragStart: function( draggable, event ) {
+                //Listen for scrolling so that if the dragging causes scrolling the position of the droppables can be recalculated (see #5003)
+                draggable.element.parents( ":not(body,html)" ).bind( "scroll.droppable", function() {
+                        if( !draggable.options.refreshPositions ) $.ui.ddmanager.prepareOffsets( draggable, event );
+                });
         },
         drag: function(draggable, event) {
@@ -280 +286 @@
                 });
 
+        },
+        dragStop: function( draggable, event ) {
+                draggable.element.parents( ":not(body,html)" ).unbind( "scroll.droppable" );
+                //Call prepareOffsets one final time since IE does not fire return scroll events when overflow was caused by drag (see #5003)
+                if( !draggable.options.refreshPositions ) $.ui.ddmanager.prepareOffsets( draggable, event );
         }
 };