library-mirrors/jquery-ui
1
0
Fork 0
mirror of https://github.com/jquery/jquery-ui.git synced 2024-11-21 11:04:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Draggable: apply axis options to position instead of style. Fixes #7251 - Draggable: constrained axis option returns incorrect position.

Browse Source
This commit is contained in:
Mike Sherov 2013-10-20 19:33:40 -04:00
parent 9ca0a19a00
commit 94f8c4d5e9
2 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tests/unit/draggable/draggable_options.js
View File

@ -106,14 +106,28 @@ test( "{ axis: false }, default", function() {
}); });
test( "{ axis: 'x' }", function() { test( "{ axis: 'x' }", function() {
expect( 2 ); expect( 3 );
var element = $( "#draggable2" ).draggable({ axis: "x" }); var element = $( "#draggable2" ).draggable({
axis: "x",
// TODO: remove the stop callback when all TestHelpers.draggable.testDrag bugs are fixed
stop: function( event, ui ) {
var expectedPosition = { left: ui.originalPosition.left + 50, top: ui.originalPosition.top };
deepEqual( ui.position, expectedPosition, "position dragged[50,0] for axis: x" );
}
});
TestHelpers.draggable.testDrag( element, element, 50, 50, 50, 0, "axis: x" ); TestHelpers.draggable.testDrag( element, element, 50, 50, 50, 0, "axis: x" );
}); });
test( "{ axis: 'y' }", function() { test( "{ axis: 'y' }", function() {
expect( 2 ); expect( 3 );
var element = $( "#draggable2" ).draggable({ axis: "y" }); var element = $( "#draggable2" ).draggable({
axis: "y",
// TODO: remove the stop callback when all TestHelpers.draggable.testDrag bugs are fixed
stop: function( event, ui ) {
var expectedPosition = { left: ui.originalPosition.left, top: ui.originalPosition.top + 50 };
deepEqual( ui.position, expectedPosition, "position dragged[0,50] for axis: y" );
}
});
TestHelpers.draggable.testDrag( element, element, 50, 50, 0, 50, "axis: y" ); TestHelpers.draggable.testDrag( element, element, 50, 50, 0, 50, "axis: y" );
}); });

16
ui/jquery.ui.draggable.js vendored
View File

@ -221,12 +221,9 @@ $.widget("ui.draggable", $.ui.mouse, {
this.position = ui.position; this.position = ui.position;
} }
if(!this.options.axis || this.options.axis !== "y") { this.helper[ 0 ].style.left = this.position.left + "px";
this.helper[0].style.left = this.position.left+"px"; this.helper[ 0 ].style.top = this.position.top + "px";
}
if(!this.options.axis || this.options.axis !== "x") {
this.helper[0].style.top = this.position.top+"px";
}
if($.ui.ddmanager) { if($.ui.ddmanager) {
$.ui.ddmanager.drag(this, event); $.ui.ddmanager.drag(this, event);
} }
@ -554,6 +551,13 @@ $.widget("ui.draggable", $.ui.mouse, {
pageX = containment ? ((left - this.offset.click.left >= containment[0] || left - this.offset.click.left > containment[2]) ? left : ((left - this.offset.click.left >= containment[0]) ? left - o.grid[0] : left + o.grid[0])) : left; pageX = containment ? ((left - this.offset.click.left >= containment[0] || left - this.offset.click.left > containment[2]) ? left : ((left - this.offset.click.left >= containment[0]) ? left - o.grid[0] : left + o.grid[0])) : left;
} }
if ( o.axis === "y" ) {
pageX = this.originalPageX;
}
if ( o.axis === "x" ) {
pageY = this.originalPageY;
}
} }
return { return {