r869 - trunk/ui

Author: paul.bakaus
Date: Thu Nov 6 03:24:34 2008
New Revision: 869
Modified:
trunk/ui/ui.sortable.js
Log:
sortable: returning false in any callback will now call this.cancenl() to
cancel the ongoing action
Modified: trunk/ui/ui.sortable.js
==============================================================================
--- trunk/ui/ui.sortable.js    (original)
+++ trunk/ui/ui.sortable.js    Thu Nov 6 03:24:34 2008
@@ -104,7 +104,8 @@
    _propagate: function(n,e,inst, noPropagation) {
        $.ui.plugin.call(this, n, [e, this._ui(inst)]);
-        if(!noPropagation) this.element.triggerHandler(n == "sort" ?
n : "sort"+n, [e, this._ui(inst)], this.options[n]);
+        var dontCancel = !noPropagation ? this.element.triggerHandler(n
== "sort" ? n : "sort"+n, [e, this._ui(inst)], this.options[n]) : true;
+        if(dontCancel === false) this.cancel();
    },
    serialize: function(o) {