Droppable: Make sure._drop is called for all relevant droppables. Fix…

…es #6009 - Upper droppable should receive draggable. Fixes #6085 - Parent droppable takes precedence over dynamically created child droppable. (cherry picked from commit fdc332e)
jquery · Nov 21, 2011 · f7b28df28809bca05623b7394919d15919334afb · f7b28df
1 parent 56422bd
commit f7b28df28809bca05623b7394919d15919334afb
Unified Split

Showing with 1 addition and 1 deletion.

+1 −1 ui/jquery.ui.droppable.js
diff --git a/ui/jquery.ui.droppable.js b/ui/jquery.ui.droppable.js
@@ -227,7 +227,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;