Skip to content

Commit

Permalink
Droppable: Make sure._drop is called for all relevant droppables. Fix…
Browse files Browse the repository at this point in the history 
…es #6009 - Upper droppable should receive draggable. Fixes #6085 - Parent droppable takes precedence over dynamically created child droppable.
  • Loading branch information
@bikeshedder @scottgonzalez
bikeshedder authored and scottgonzalez committed Nov 21, 2011
1 parent 5fb9629 commit fdc332e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion ui/jquery.ui.droppable.js
View file
Expand Up @@ -224,7 +224,7 @@ $.ui.ddmanager = {


if(!this.options) return; if(!this.options) return;
if (!this.options.disabled && this.visible && $.ui.intersect(draggable, this, this.options.tolerance)) 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))) { if (!this.options.disabled && this.visible && this.accept.call(this.element[0],(draggable.currentItem || draggable.element))) {
this.isout = 1; this.isover = 0; this.isout = 1; this.isover = 0;
Expand Down

3 comments on commit fdc332e

@scottgonzalez
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bikeshedder Can you please sign our CLA?

@bikeshedder
Copy link
Contributor Author

@bikeshedder bikeshedder commented on fdc332e Dec 11, 2013 via email

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@scottgonzalez
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks.

Please sign in to comment.