aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott González <scott.gonzalez@gmail.com>2010-01-28 02:24:42 +0000
committerScott González <scott.gonzalez@gmail.com>2010-01-28 02:24:42 +0000
commitdd92e1608185b45e7dc9ae9b3ac2a8b5b84ea19c (patch)
tree6d7be4b3f9d0d3393289676a1ac0afa34380c55e
parent0923066abbceda1f23cefca26ae33046163c6298 (diff)
downloadjquery-ui-dd92e1608185b45e7dc9ae9b3ac2a8b5b84ea19c.tar.gz
jquery-ui-dd92e1608185b45e7dc9ae9b3ac2a8b5b84ea19c.zip
$.ui.ddmanager.drop() now works properly for nested droppables.
Fixes #5095 - Droppable body let revert a div on a valid drop.
-rw-r--r--ui/jquery.ui.droppable.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/jquery.ui.droppable.js b/ui/jquery.ui.droppable.js
index 2b4031915..0ee614ea9 100644
--- a/ui/jquery.ui.droppable.js
+++ b/ui/jquery.ui.droppable.js
@@ -228,7 +228,7 @@ $.ui.ddmanager = {
if(!this.options) return;
if (!this.options.disabled && this.visible && $.ui.intersect(draggable, this, this.options.tolerance))
- dropped = this._drop.call(this, event);
+ dropped = dropped || this._drop.call(this, event);
if (!this.options.disabled && this.visible && this.accept.call(this.element[0],(draggable.currentItem || draggable.element))) {
this.isout = 1; this.isover = 0;