From: Michael P. Jung <michael.jung@terreon.de>
Date: Mon, 21 Nov 2011 21:16:32 +0000 (-0500)
Subject: Droppable: Make sure._drop is called for all relevant droppables. Fixes #6009 - Upper... 
X-Git-Tag: 1.9m7~133
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=fdc332ed5fb7f7e688151d5cae9b450569d73da5;p=jquery-ui.git

Droppable: Make sure._drop is called for all relevant droppables. Fixes #6009 - Upper droppable should receive draggable. Fixes #6085 - Parent droppable takes precedence over dynamically created child droppable.
---

diff --git a/ui/jquery.ui.droppable.js b/ui/jquery.ui.droppable.js
index 3942c6b8f..62bba2aba 100644
--- a/ui/jquery.ui.droppable.js
+++ b/ui/jquery.ui.droppable.js
@@ -224,7 +224,7 @@ $.ui.ddmanager = {
 
 			if(!this.options) return;
 			if (!this.options.disabled && this.visible && $.ui.intersect(draggable, this, this.options.tolerance))
-				dropped = dropped || this._drop.call(this, event);
+				dropped = this._drop.call(this, event) || dropped;
 
 			if (!this.options.disabled && this.visible && this.accept.call(this.element[0],(draggable.currentItem || draggable.element))) {
 				this.isout = 1; this.isover = 0;