mirror of
https://github.com/jquery/jquery-ui.git
synced 2024-11-21 11:04:24 +00:00
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 fdc332ed5f
)
This commit is contained in:
parent
56422bdef5
commit
f7b28df288
2
ui/jquery.ui.droppable.js
vendored
2
ui/jquery.ui.droppable.js
vendored
@ -227,7 +227,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;
|
||||||
|
Loading…
Reference in New Issue
Block a user