diff options
| author | Marcel Toele <EleotleCram@gmail.com> | 2011-03-11 15:37:52 +0100 |
|---|---|---|
| committer | Scott González <scott.gonzalez@gmail.com> | 2011-03-11 10:21:24 -0500 |
| commit | c5b0a8660a57676815901b24be84b3a4bb5a625a (patch) | |
| tree | 5f99212bd1d8c4a55b2d9361fe2ef6a40a38a2b9 /ui/jquery.ui.droppable.js | |
| parent | 6bd5c08a1d3f28976ef2fb8c31988cd9c18ee055 (diff) | |
| download | jquery-ui-c5b0a8660a57676815901b24be84b3a4bb5a625a.tar.gz jquery-ui-c5b0a8660a57676815901b24be84b3a4bb5a625a.zip | |
Droppable: enabled and accepting droppables are now activated prior to evaluating their geometry. Fixes #7104 Droppable: if activeClass changes the geometry of a droppable, then dnd uses the wrong geometry.
(cherry picked from commit 86e6ed2eb18adcc7f9f96dc347848608cc3d3120)
Diffstat (limited to 'ui/jquery.ui.droppable.js')
| -rw-r--r-- | ui/jquery.ui.droppable.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/jquery.ui.droppable.js b/ui/jquery.ui.droppable.js index decdc1712..b8a93cd46 100644 --- 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 - } }, |