aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorBaoju Yuan <the_guy_1987@hotmail.com>2012-07-16 10:26:02 -0400
committerScott González <scott.gonzalez@gmail.com>2012-07-16 10:26:02 -0400
commitdcea4f043adc7f37674feead31ded148d311ab72 (patch)
treedf33dda896c08c95b6cf4eb3e81e1e0742fc5e3b /ui
parent0a1cd9501c01b92a7f007cea1040f50ef4997400 (diff)
downloadjquery-ui-dcea4f043adc7f37674feead31ded148d311ab72.tar.gz
jquery-ui-dcea4f043adc7f37674feead31ded148d311ab72.zip
Sortable: Reset fromOutside property when canceling helper removal. Fixes #8430 - draggable with sortable makes sortable event receive triggered wrong.
Diffstat (limited to 'ui')
-rw-r--r--ui/jquery.ui.sortable.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/ui/jquery.ui.sortable.js b/ui/jquery.ui.sortable.js
index 7e5875200..db24fed38 100644
--- a/ui/jquery.ui.sortable.js
+++ b/ui/jquery.ui.sortable.js
@@ -1030,6 +1030,8 @@ $.widget("ui.sortable", $.ui.mouse, {
for (var i=0; i < delayedTriggers.length; i++) { delayedTriggers[i].call(this, event); }; //Trigger all delayed events
this._trigger("stop", event, this._uiHash());
}
+
+ this.fromOutside = false;
return false;
}