diff options
| author | Scott González <scott.gonzalez@gmail.com> | 2011-03-11 10:19:45 -0500 |
|---|---|---|
| committer | Scott González <scott.gonzalez@gmail.com> | 2011-03-11 10:19:45 -0500 |
| commit | 0eb1106b5b7a1ad01d76c38b1cbb5b16e55ca156 (patch) | |
| tree | acf90b49475224559694b66f45bc8a5a77807122 /ui | |
| parent | 3f8c608691f404b750fb902e1cda45cf0135e710 (diff) | |
| parent | 86e6ed2eb18adcc7f9f96dc347848608cc3d3120 (diff) | |
| download | jquery-ui-0eb1106b5b7a1ad01d76c38b1cbb5b16e55ca156.tar.gz jquery-ui-0eb1106b5b7a1ad01d76c38b1cbb5b16e55ca156.zip | |
Merge branch 'ddmanager-caches-wrong-dimensions' of https://github.com/EleotleCram/jquery-ui into EleotleCram-ddmanager-caches-wrong-dimensions
Diffstat (limited to 'ui')
| -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 - } }, |