Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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)
  • Loading branch information
bikeshedder authored and scottgonzalez committed Nov 21, 2011
1 parent 56422bd commit f7b28df
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion ui/jquery.ui.droppable.js
Expand Up @@ -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;
Expand Down

0 comments on commit f7b28df

Please sign in to comment.