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:18:32 -0500 |
| commit | f7b28df28809bca05623b7394919d15919334afb (patch) | |
| tree | b6bff98e884f30548000372e9522974406855175 | |
| parent | 56422bdef52b5ed8c009135a5498f5d79c41480a (diff) | |
| download | jquery-ui-f7b28df28809bca05623b7394919d15919334afb.tar.gz jquery-ui-f7b28df28809bca05623b7394919d15919334afb.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.
(cherry picked from commit fdc332ed5fb7f7e688151d5cae9b450569d73da5)
| -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 dabf29d6c..8b3c56867 100644 --- a/ui/jquery.ui.droppable.js +++ b/ui/jquery.ui.droppable.js @@ -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; |