Sortable - Prevent mouseCapture while help is reverting

This commit is contained in:
Eduardo Lundgren 2008-10-28 06:41:11 +00:00
parent f69197bcec
commit cd01814a85

View File

@ -384,6 +384,10 @@ $.widget("ui.sortable", $.extend({}, $.ui.mouse, {
_mouseCapture: function(e, overrideHandle) { _mouseCapture: function(e, overrideHandle) {
if (this.reverting) {
return false;
}
if(this.options.disabled || this.options.type == 'static') return false; if(this.options.disabled || this.options.type == 'static') return false;
//We have to refresh the items data once first //We have to refresh the items data once first
@ -697,6 +701,8 @@ $.widget("ui.sortable", $.extend({}, $.ui.mouse, {
var self = this; var self = this;
var cur = self.placeholder.offset(); var cur = self.placeholder.offset();
self.reverting = true;
$(this.helper).animate({ $(this.helper).animate({
left: cur.left - this.offset.parent.left - self.margins.left + (this.offsetParent[0] == document.body ? 0 : this.offsetParent[0].scrollLeft), left: cur.left - this.offset.parent.left - self.margins.left + (this.offsetParent[0] == document.body ? 0 : this.offsetParent[0].scrollLeft),
top: cur.top - this.offset.parent.top - self.margins.top + (this.offsetParent[0] == document.body ? 0 : this.offsetParent[0].scrollTop) top: cur.top - this.offset.parent.top - self.margins.top + (this.offsetParent[0] == document.body ? 0 : this.offsetParent[0].scrollTop)
@ -713,6 +719,8 @@ $.widget("ui.sortable", $.extend({}, $.ui.mouse, {
_clear: function(e, noPropagation) { _clear: function(e, noPropagation) {
this.reverting = false;
//We first have to update the dom position of the actual currentItem //We first have to update the dom position of the actual currentItem
if(!this._noFinalSort) this.placeholder.before(this.currentItem); if(!this._noFinalSort) this.placeholder.before(this.currentItem);
this._noFinalSort = null; this._noFinalSort = null;