Droppable: enabled and accepting droppables are now activated prior to evaluating...

(cherry picked from commit 86e6ed2eb18adcc7f9f96dc347848608cc3d3120)

diff --git a/ui/jquery.ui.droppable.js b/ui/jquery.ui.droppable.js
index decdc1712a8028f63691c9f2aecca9ae621914a4..b8a93cd460bfd5c750e064f649e96e9e27e97b38 100644 (file)
--- a/ui/jquery.ui.droppable.js
+++ b/ui/jquery.ui.droppable.js
@@ -212,11 +212,11 @@ $.ui.ddmanager = {
                        for (var j=0; j < list.length; j++) { if(list[j] == m[i].element[0]) { m[i].proportions.height = 0; continue droppablesLoop; } }; //Filter out elements in the current dragged item
                        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
-
                }
 
        },