From: Marcel Toele <EleotleCram@gmail.com>
Date: Fri, 11 Mar 2011 14:37:52 +0000 (+0100)
Subject: Droppable: enabled and accepting droppables are now activated prior to evaluating... 
X-Git-Tag: 1.9m5~231^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fpull%2F150%2Fhead;p=jquery-ui.git

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.
---

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
-
 		}
 
 	},