Permalink
Browse files
Sortable: Only animate along the specified axis when reverting. Fixes…
… #7415 - Sortable: Incorrect revert animation with axis: 'y'.
- Loading branch information
Showing
with
10 additions
and
6 deletions.
-
+10
−6
ui/jquery.ui.sortable.js
|
|
@@ -417,14 +417,18 @@ $.widget("ui.sortable", $.ui.mouse, { |
|
|
|
|
|
if(this.options.revert) { |
|
|
var that = this, |
|
|
cur = this.placeholder.offset(); |
|
|
cur = this.placeholder.offset(), |
|
|
axis = this.options.axis, |
|
|
animation = {}; |
|
|
|
|
|
if ( !axis || axis === "x" ) { |
|
|
animation.left = cur.left - this.offset.parent.left - this.margins.left + (this.offsetParent[0] === document.body ? 0 : this.offsetParent[0].scrollLeft); |
|
|
} |
|
|
if ( !axis || axis === "y" ) { |
|
|
animation.top = cur.top - this.offset.parent.top - this.margins.top + (this.offsetParent[0] === document.body ? 0 : this.offsetParent[0].scrollTop); |
|
|
} |
|
|
this.reverting = true; |
|
|
|
|
|
$(this.helper).animate({ |
|
|
left: cur.left - this.offset.parent.left - this.margins.left + (this.offsetParent[0] === document.body ? 0 : this.offsetParent[0].scrollLeft), |
|
|
top: cur.top - this.offset.parent.top - this.margins.top + (this.offsetParent[0] === document.body ? 0 : this.offsetParent[0].scrollTop) |
|
|
}, parseInt(this.options.revert, 10) || 500, function() { |
|
|
$(this.helper).animate( animation, parseInt(this.options.revert, 10) || 500, function() { |
|
|
that._clear(event); |
|
|
}); |
|
|
} else { |
|
|
|
