diff options
| author | kborchers <kris.borchers@gmail.com> | 2011-12-01 12:53:35 -0600 |
|---|---|---|
| committer | kborchers <kris.borchers@gmail.com> | 2011-12-01 12:53:35 -0600 |
| commit | 490dc4d36b6a0bf1dac5d8a9ba86aef7c9c27ee9 (patch) | |
| tree | e65043eb657d9232888dcc1435bdd6907f990d15 /ui/jquery.ui.droppable.js | |
| parent | e206e549352684a4c30ad53e38c5544599328f2d (diff) | |
| parent | ce7918fc73c161ab237f052bad070e34250526be (diff) | |
| download | jquery-ui-490dc4d36b6a0bf1dac5d8a9ba86aef7c9c27ee9.tar.gz jquery-ui-490dc4d36b6a0bf1dac5d8a9ba86aef7c9c27ee9.zip | |
Merge branch 'master' into menubar_otherStructures
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; |