Skip to content

Commit f7b28df

Browse files
bikeshedderscottgonzalez
authored andcommitted
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.
(cherry picked from commit fdc332e)
1 parent 56422bd commit f7b28df

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

ui/jquery.ui.droppable.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ $.ui.ddmanager = {
227227

228228
if(!this.options) return;
229229
if (!this.options.disabled && this.visible && $.ui.intersect(draggable, this, this.options.tolerance))
230-
dropped = dropped || this._drop.call(this, event);
230+
dropped = this._drop.call(this, event) || dropped;
231231

232232
if (!this.options.disabled && this.visible && this.accept.call(this.element[0],(draggable.currentItem || draggable.element))) {
233233
this.isout = 1; this.isover = 0;

0 commit comments

Comments
 (0)