mirror of
https://github.com/jquery/jquery-ui.git
synced 2024-10-05 01:44:18 +00:00
Sortable: Only animate along the specified axis when reverting. Fixes #7415 - Sortable: Incorrect revert animation with axis: 'y'.
This commit is contained in:
parent
5dca601bc6
commit
054449e214
16
ui/jquery.ui.sortable.js
vendored
16
ui/jquery.ui.sortable.js
vendored
@ -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 {
|
||||
|
Loading…
Reference in New Issue
Block a user