diff options
| author | Michael P. Jung <michael.jung@terreon.de> | 2011-11-21 16:16:32 -0500 |
|---|---|---|
| committer | Scott González <scott.gonzalez@gmail.com> | 2011-11-21 16:16:32 -0500 |
| commit | fdc332ed5fb7f7e688151d5cae9b450569d73da5 (patch) | |
| tree | 5eb45c38a07fd123bd9bfe0ed768d72459dcd5ae /ui/jquery.ui.droppable.js | |
| parent | 5fb9629766f10a9119e0099bd8aee06f86cc3f30 (diff) | |
| download | jquery-ui-fdc332ed5fb7f7e688151d5cae9b450569d73da5.tar.gz jquery-ui-fdc332ed5fb7f7e688151d5cae9b450569d73da5.zip | |
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.
Diffstat (limited to 'ui/jquery.ui.droppable.js')
| -rw-r--r-- | ui/jquery.ui.droppable.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/jquery.ui.droppable.js b/ui/jquery.ui.droppable.js index 3942c6b8f..62bba2aba 100644 --- a/ui/jquery.ui.droppable.js +++ b/ui/jquery.ui.droppable.js @@ -224,7 +224,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; |