diff options
| author | Jörn Zaefferer <joern.zaefferer@gmail.com> | 2011-11-24 11:25:24 +0100 |
|---|---|---|
| committer | Jörn Zaefferer <joern.zaefferer@gmail.com> | 2011-11-24 11:25:24 +0100 |
| commit | 9bd08798c27f849b85a75bcaca009df85a48545f (patch) | |
| tree | fe70613527b58aba17a1f9760dcda6771fffe4f0 /ui/jquery.ui.droppable.js | |
| parent | d97b6db2cdcc2adf88381c3d7a7d733ea51fab71 (diff) | |
| parent | 74a3f2ce0897ce8bdcac2acc997e68e3e8603121 (diff) | |
| download | jquery-ui-9bd08798c27f849b85a75bcaca009df85a48545f.tar.gz jquery-ui-9bd08798c27f849b85a75bcaca009df85a48545f.zip | |
Merge branch 'master' into selectmenu
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; |