Permalink
Browse files

Droppable: enabled and accepting droppables are now activated prior t…

…o evaluating their geometry. Fixes #7104 Droppable: if activeClass changes the geometry of a droppable, then dnd uses the wrong geometry.

(cherry picked from commit 86e6ed2)
  • Loading branch information...
1 parent 6bd5c08 commit c5b0a8660a57676815901b24be84b3a4bb5a625a @EleotleCram EleotleCram committed with scottgonzalez Mar 11, 2011
Showing with 2 additions and 2 deletions.
  1. +2 −2 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
-
}
},

0 comments on commit c5b0a86

Please sign in to comment.