library-mirrors/jquery-ui
1
0
Fork 0
mirror of https://github.com/jquery/jquery-ui.git synced 2025-01-07 20:34:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

sortable: removed support for ui.cancel(), must now be called via the sortable() function as method (sortable('cancel')). Now works even if the drag is still ongoing, i.e. the mouse button is still pressed.

Browse Source
This commit is contained in:
Paul Bakaus 2008-11-04 13:34:04 +00:00
parent 5e5116b3d4
commit e4d0e3e2e3
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ui/ui.sortable.js
View File

@ -45,7 +45,7 @@ $.widget("ui.sortable", $.extend({}, $.ui.mouse, {
}, },
plugins: {}, plugins: {},
ui: function(inst) { _ui: function(inst) {
var self = inst || this; var self = inst || this;
return { return {
helper: self.helper, helper: self.helper,
@ -55,14 +55,16 @@ $.widget("ui.sortable", $.extend({}, $.ui.mouse, {
options: this.options, options: this.options,
element: this.element, element: this.element,
item: self.currentItem, item: self.currentItem,
sender: inst ? inst.element : null, sender: inst ? inst.element : null
cancel: function() { self.cancel(); }
}; };
}, },
cancel: function() { cancel: function() {
if(this.dragging) { if(this.dragging) {
this._mouseUp();
if(this.options.helper == "original") if(this.options.helper == "original")
this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper"); this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper");
else else
@ -76,6 +78,7 @@ $.widget("ui.sortable", $.extend({}, $.ui.mouse, {
this.containers[i].containerCache.over = 0; this.containers[i].containerCache.over = 0;
} }
} }
} }
//$(this.placeholder[0]).remove(); would have been the jQuery way - unfortunately, it unbinds ALL events from the original node! //$(this.placeholder[0]).remove(); would have been the jQuery way - unfortunately, it unbinds ALL events from the original node!
@ -100,8 +103,8 @@ $.widget("ui.sortable", $.extend({}, $.ui.mouse, {
}, },
_propagate: function(n,e,inst, noPropagation) { _propagate: function(n,e,inst, noPropagation) {
$.ui.plugin.call(this, n, [e, this.ui(inst)]); $.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]); if(!noPropagation) this.element.triggerHandler(n == "sort" ? n : "sort"+n, [e, this._ui(inst)], this.options[n]);
}, },
serialize: function(o) { serialize: function(o) {
@ -699,7 +702,7 @@ $.widget("ui.sortable", $.extend({}, $.ui.mouse, {
} }
//Call the internal plugins //Call the internal plugins
$.ui.plugin.call(this, "sort", [e, this.ui()]); $.ui.plugin.call(this, "sort", [e, this._ui()]);
//Regenerate the absolute position used for position checks //Regenerate the absolute position used for position checks
this.positionAbs = this._convertPositionTo("absolute"); this.positionAbs = this._convertPositionTo("absolute");
@ -738,7 +741,7 @@ $.widget("ui.sortable", $.extend({}, $.ui.mouse, {
if($.ui.ddmanager) $.ui.ddmanager.drag(this, e); if($.ui.ddmanager) $.ui.ddmanager.drag(this, e);
//Call callbacks //Call callbacks
this.element.triggerHandler("sort", [e, this.ui()], this.options["sort"]); this.element.triggerHandler("sort", [e, this._ui()], this.options["sort"]);
this.lastPositionAbs = this.positionAbs; this.lastPositionAbs = this.positionAbs;
@ -766,6 +769,8 @@ $.widget("ui.sortable", $.extend({}, $.ui.mouse, {
_mouseStop: function(e, noPropagation) { _mouseStop: function(e, noPropagation) {
if(!e) return;
//If we are using droppables, inform the manager about the drop //If we are using droppables, inform the manager about the drop
if ($.ui.ddmanager && !this.options.dropBehaviour) if ($.ui.ddmanager && !this.options.dropBehaviour)
$.ui.ddmanager.drop(this, e); $.ui.ddmanager.drop(this, e);