From: Paul Bakaus <paul.bakaus@googlemail.com>
Date: Sat, 22 Aug 2009 12:25:50 +0000 (+0000)
Subject: droppable: greedy childs that dont accept the draggable dont block propagation anymor... 
X-Git-Tag: 1.8a2~131
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d28166805f72de1f76dcbc322e5c79ec50791882;p=jquery-ui.git

droppable: greedy childs that dont accept the draggable dont block propagation anymore, fixes #4570
---

diff --git a/ui/ui.droppable.js b/ui/ui.droppable.js
index 7966ae3b0..4c359799c 100644
--- a/ui/ui.droppable.js
+++ b/ui/ui.droppable.js
@@ -103,9 +103,13 @@ $.widget("ui.droppable", {
 		var childrenIntersection = false;
 		this.element.find(":data(droppable)").not(".ui-draggable-dragging").each(function() {
 			var inst = $.data(this, 'droppable');
-			if(inst.options.greedy && $.ui.intersect(draggable, $.extend(inst, { offset: inst.element.offset() }), inst.options.tolerance)) {
-				childrenIntersection = true; return false;
-			}
+			if(
+				inst.options.greedy
+				&& !inst.options.disabled
+				&& inst.options.scope == draggable.options.scope
+				&& inst.accept.call(inst.element[0], (draggable.currentItem || draggable.element))
+				&& $.ui.intersect(draggable, $.extend(inst, { offset: inst.element.offset() }), inst.options.tolerance)
+			) { childrenIntersection = true; return false; }
 		});
 		if(childrenIntersection) return false;
 
@@ -239,7 +243,6 @@ $.ui.ddmanager = {
 		if(draggable.options.refreshPositions) $.ui.ddmanager.prepareOffsets(draggable, event);
 
 		//Run through all droppables and check their positions based on specific tolerance options
-
 		$.each($.ui.ddmanager.droppables[draggable.options.scope] || [], function() {
 
 			if(this.options.disabled || this.greedyChild || !this.visible) return;