diff options
| author | Baoju Yuan <the_guy_1987@hotmail.com> | 2012-07-16 10:26:02 -0400 |
|---|---|---|
| committer | Scott González <scott.gonzalez@gmail.com> | 2012-07-16 10:27:15 -0400 |
| commit | 347aa335f001c6e80e6670c90c6262a358b89932 (patch) | |
| tree | ce05646b99f07dbc6d00f32772e05af5ed3a1c16 | |
| parent | 8fcbe502ee548fe8c10cf64d7053c70837fdcca3 (diff) | |
| download | jquery-ui-347aa335f001c6e80e6670c90c6262a358b89932.tar.gz jquery-ui-347aa335f001c6e80e6670c90c6262a358b89932.zip | |
Sortable: Reset fromOutside property when canceling helper removal. Fixes #8430 - draggable with sortable makes sortable event receive triggered wrong.
(cherry picked from commit dcea4f043adc7f37674feead31ded148d311ab72)
| -rw-r--r-- | ui/jquery.ui.sortable.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ui/jquery.ui.sortable.js b/ui/jquery.ui.sortable.js index c369ffa1c..403fc53eb 100644 --- a/ui/jquery.ui.sortable.js +++ b/ui/jquery.ui.sortable.js @@ -1034,6 +1034,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; } |