diff options
| author | Mike Sherov <mike.sherov@gmail.com> | 2014-08-14 09:50:02 -0400 |
|---|---|---|
| committer | Mike Sherov <mike.sherov@gmail.com> | 2014-08-14 09:50:02 -0400 |
| commit | 2d03839c07a33d14ec7b31b2d4290a8ce6fc0cef (patch) | |
| tree | 4c47f2e6265699da29ad3d8f8696fbb02b5ac292 | |
| parent | 54004c85d02ba5688549736e0fb8f883c88b668b (diff) | |
| download | jquery-ui-2d03839c07a33d14ec7b31b2d4290a8ce6fc0cef.tar.gz jquery-ui-2d03839c07a33d14ec7b31b2d4290a8ce6fc0cef.zip | |
Draggable: Account for margins when snapping
Fixes #9724
| -rw-r--r-- | tests/unit/draggable/draggable_options.js | 4 | ||||
| -rw-r--r-- | ui/draggable.js | 20 |
2 files changed, 14 insertions, 10 deletions
diff --git a/tests/unit/draggable/draggable_options.js b/tests/unit/draggable/draggable_options.js index f59a33693..4f319e404 100644 --- a/tests/unit/draggable/draggable_options.js +++ b/tests/unit/draggable/draggable_options.js @@ -961,6 +961,10 @@ test( "snap, snapMode, and snapTolerance", function() { }), element2 = $( "#draggable2" ).draggable(); + // http://bugs.jqueryui.com/ticket/9724 + // Draggable: Snapping coordinates thrown off by margin on draggable + element.css( "margin", "3px" ); + element.offset({ top: 1, left: 1 diff --git a/ui/draggable.js b/ui/draggable.js index a6de2889c..b96fca0d2 100644 --- a/ui/draggable.js +++ b/ui/draggable.js @@ -916,9 +916,9 @@ $.ui.plugin.add("draggable", "snap", { for (i = inst.snapElements.length - 1; i >= 0; i--){ - l = inst.snapElements[i].left; + l = inst.snapElements[i].left - inst.margins.left; r = l + inst.snapElements[i].width; - t = inst.snapElements[i].top; + t = inst.snapElements[i].top - inst.margins.top; b = t + inst.snapElements[i].height; if ( x2 < l - d || x1 > r + d || y2 < t - d || y1 > b + d || !$.contains( inst.snapElements[ i ].item.ownerDocument, inst.snapElements[ i ].item ) ) { @@ -935,16 +935,16 @@ $.ui.plugin.add("draggable", "snap", { ls = Math.abs(l - x2) <= d; rs = Math.abs(r - x1) <= d; if (ts) { - ui.position.top = inst._convertPositionTo("relative", { top: t - inst.helperProportions.height, left: 0 }).top - inst.margins.top; + ui.position.top = inst._convertPositionTo("relative", { top: t - inst.helperProportions.height, left: 0 }).top; } if (bs) { - ui.position.top = inst._convertPositionTo("relative", { top: b, left: 0 }).top - inst.margins.top; + ui.position.top = inst._convertPositionTo("relative", { top: b, left: 0 }).top; } if (ls) { - ui.position.left = inst._convertPositionTo("relative", { top: 0, left: l - inst.helperProportions.width }).left - inst.margins.left; + ui.position.left = inst._convertPositionTo("relative", { top: 0, left: l - inst.helperProportions.width }).left; } if (rs) { - ui.position.left = inst._convertPositionTo("relative", { top: 0, left: r }).left - inst.margins.left; + ui.position.left = inst._convertPositionTo("relative", { top: 0, left: r }).left; } } @@ -956,16 +956,16 @@ $.ui.plugin.add("draggable", "snap", { ls = Math.abs(l - x1) <= d; rs = Math.abs(r - x2) <= d; if (ts) { - ui.position.top = inst._convertPositionTo("relative", { top: t, left: 0 }).top - inst.margins.top; + ui.position.top = inst._convertPositionTo("relative", { top: t, left: 0 }).top; } if (bs) { - ui.position.top = inst._convertPositionTo("relative", { top: b - inst.helperProportions.height, left: 0 }).top - inst.margins.top; + ui.position.top = inst._convertPositionTo("relative", { top: b - inst.helperProportions.height, left: 0 }).top; } if (ls) { - ui.position.left = inst._convertPositionTo("relative", { top: 0, left: l }).left - inst.margins.left; + ui.position.left = inst._convertPositionTo("relative", { top: 0, left: l }).left; } if (rs) { - ui.position.left = inst._convertPositionTo("relative", { top: 0, left: r - inst.helperProportions.width }).left - inst.margins.left; + ui.position.left = inst._convertPositionTo("relative", { top: 0, left: r - inst.helperProportions.width }).left; } } |