From 86e6ed2eb18adcc7f9f96dc347848608cc3d3120 Mon Sep 17 00:00:00 2001 From: Marcel Toele Date: Fri, 11 Mar 2011 15:37:52 +0100 Subject: 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. --- ui/jquery.ui.droppable.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ui/jquery.ui.droppable.js') 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 - } }, -- cgit v1.2.3