aboutsummaryrefslogtreecommitdiffstats
path: root/ui/jquery.ui.sortable.js
diff options
context:
space:
mode:
authorFelix Nagel <info@felixnagel.com>2012-08-11 19:45:43 +0200
committerFelix Nagel <info@felixnagel.com>2012-08-11 19:45:43 +0200
commitdd272e75689a7e105f7d852f0fc903e4f4bda245 (patch)
tree5c097bc4ce4ab3ead310c63ac228bb1f0d3683b6 /ui/jquery.ui.sortable.js
parent549b97ed6cc718087ce8b9bff3c8556ab4ca7848 (diff)
parent30b579f598a3abdc9b0b7ad18bc76c8b5438d5ca (diff)
downloadjquery-ui-dd272e75689a7e105f7d852f0fc903e4f4bda245.tar.gz
jquery-ui-dd272e75689a7e105f7d852f0fc903e4f4bda245.zip
Merge branch 'master' into selectmenu
Diffstat (limited to 'ui/jquery.ui.sortable.js')
-rw-r--r--ui/jquery.ui.sortable.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/ui/jquery.ui.sortable.js b/ui/jquery.ui.sortable.js
index 7e5875200..8d7b6ccb8 100644
--- a/ui/jquery.ui.sortable.js
+++ b/ui/jquery.ui.sortable.js
@@ -3,7 +3,7 @@
* http://jqueryui.com
*
* Copyright 2012 jQuery Foundation and other contributors
- * Dual licensed under the MIT or GPL Version 2 licenses.
+ * Released under the MIT license.
* http://jquery.org/license
*
* http://docs.jquery.com/UI/Sortables
@@ -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;
}