diff options
| author | Jason Moon <jmoon@socialcast.com> | 2013-03-21 09:56:39 -0500 |
|---|---|---|
| committer | Mike Sherov <mike.sherov@gmail.com> | 2013-03-23 15:42:38 -0400 |
| commit | f306a826a4d3b4c36c3f86cb5feeee23bb0db4c3 (patch) | |
| tree | 45862b3b1f7033364becc2c0fbe6e51b7cfc0f4e | |
| parent | ae4753b3f1c8d320e11a63f028ec02dc621d24e9 (diff) | |
| download | jquery-ui-f306a826a4d3b4c36c3f86cb5feeee23bb0db4c3.tar.gz jquery-ui-f306a826a4d3b4c36c3f86cb5feeee23bb0db4c3.zip | |
Sortable: update placeholder when axis is x or y for connected lists. Fixed #8301 - Placeholder doesn't move when using connectWith option
| -rw-r--r-- | tests/unit/sortable/sortable_options.js | 28 | ||||
| -rw-r--r-- | ui/jquery.ui.sortable.js | 4 |
2 files changed, 31 insertions, 1 deletions
diff --git a/tests/unit/sortable/sortable_options.js b/tests/unit/sortable/sortable_options.js index 8dcf0e82f..a499c01c1 100644 --- a/tests/unit/sortable/sortable_options.js +++ b/tests/unit/sortable/sortable_options.js @@ -151,6 +151,34 @@ test( "#8792: issues with floated items in connected lists", function() { equal( changeCount, 3, "change fired once for each expected change when dragging a floated sortable to a connected container" ); }); +test( "#8301: single axis with connected list", function() { + expect( 1 ); + + var element = $( "#sortable" ).sortable({ + axis: "y", + tolerance: "pointer", + connectWith: ".connected" + }); + + $( "<ul class='connected'><li>Item 7</li><li>Item 8</li></ul>" ) + .sortable({ + axis: "y", + tolerance: "pointer", + connectWith: "#sortable", + receive: function() { + ok( true, "connected list received item" ); + } + }) + .insertAfter( element ); + + element.find( "li" ).eq( 0 ).simulate( "drag", { + handle: "corner", + dx: -1, + dy: 114, + moves: 1 + }); +}); + /* test("{ connectWith: false }, default", function() { ok(false, "missing test - untested code is broken code."); diff --git a/ui/jquery.ui.sortable.js b/ui/jquery.ui.sortable.js index 642d5d947..d16407216 100644 --- a/ui/jquery.ui.sortable.js +++ b/ui/jquery.ui.sortable.js @@ -535,7 +535,9 @@ $.widget("ui.sortable", $.ui.mouse, { b = t + item.height, dyClick = this.offset.click.top, dxClick = this.offset.click.left, - isOverElement = (y1 + dyClick) > t && (y1 + dyClick) < b && (x1 + dxClick) > l && (x1 + dxClick) < r; + isOverElementHeight = ( this.options.axis === "x" ) || ( ( y1 + dyClick ) > t && ( y1 + dyClick ) < b ), + isOverElementWidth = ( this.options.axis === "y" ) || ( ( x1 + dxClick ) > l && ( x1 + dxClick ) < r ), + isOverElement = isOverElementHeight && isOverElementWidth; if ( this.options.tolerance === "pointer" || this.options.forcePointerForContainers || |