diff options
| -rw-r--r-- | tests/unit/draggable/draggable_core.js | 7 | ||||
| -rw-r--r-- | tests/unit/draggable/draggable_options.js | 16 |
2 files changed, 13 insertions, 10 deletions
diff --git a/tests/unit/draggable/draggable_core.js b/tests/unit/draggable/draggable_core.js index cac68518e..3ec3fb8dd 100644 --- a/tests/unit/draggable/draggable_core.js +++ b/tests/unit/draggable/draggable_core.js @@ -4,6 +4,9 @@ TestHelpers.draggable = {}; +// todo: remove these hacks +TestHelpers.draggable.unreliableOffset = $.ui.ie && ( !document.documentMode || document.documentMode < 8 ) ? 2 : 0; + TestHelpers.draggable.drag = function(handle, dx, dy) { $(handle).simulate("drag", { dx: dx || 0, @@ -57,10 +60,10 @@ TestHelpers.draggable.setScroll = function( what ) { }; TestHelpers.draggable.border = function(el, side) { - return parseInt(el.css('border-' + side + '-width'), 10); + return parseInt(el.css('border-' + side + '-width'), 10) || 0; }; TestHelpers.draggable.margin = function(el, side) { - return parseInt(el.css('margin-' + side), 10); + return parseInt(el.css('margin-' + side), 10) || 0; }; (function($) { diff --git a/tests/unit/draggable/draggable_options.js b/tests/unit/draggable/draggable_options.js index 77b2fe1db..4834dd9c4 100644 --- a/tests/unit/draggable/draggable_options.js +++ b/tests/unit/draggable/draggable_options.js @@ -281,8 +281,8 @@ test("{ cursorAt: { left: -5, top: -5 } }", function() { clientY: before.top + offsetY }; expected = { - left: before.left + offsetX - cursorAtX + deltaX, - top: before.top + offsetY - cursorAtY + deltaY + left: before.left + offsetX - cursorAtX + deltaX - TestHelpers.draggable.unreliableOffset, + top: before.top + offsetY - cursorAtY + deltaY - TestHelpers.draggable.unreliableOffset }; el.simulate("mousedown", pos); @@ -315,8 +315,8 @@ test("{ cursorAt: { right: 10, bottom: 20 } }", function() { clientY: before.top + offsetY }; expected = { - left: before.left + offsetX - el.width() + cursorAtX + deltaX, - top: before.top + offsetY - el.height() + cursorAtY + deltaY + left: before.left + offsetX - el.width() + cursorAtX + deltaX - TestHelpers.draggable.unreliableOffset, + top: before.top + offsetY - el.height() + cursorAtY + deltaY - TestHelpers.draggable.unreliableOffset }; el.simulate("mousedown", pos); @@ -349,8 +349,8 @@ test("{ cursorAt: [10, 20] }", function() { clientY: before.top + offsetY }; expected = { - left: before.left + offsetX - cursorAtX + deltaX, - top: before.top + offsetY - cursorAtY + deltaY + left: before.left + offsetX - cursorAtX + deltaX - TestHelpers.draggable.unreliableOffset, + top: before.top + offsetY - cursorAtY + deltaY - TestHelpers.draggable.unreliableOffset }; el.simulate("mousedown", pos); @@ -383,8 +383,8 @@ test("{ cursorAt: '20, 40' }", function() { clientY: before.top + offsetY }; expected = { - left: before.left + offsetX - cursorAtX + deltaX, - top: before.top + offsetY - cursorAtY + deltaY + left: before.left + offsetX - cursorAtX + deltaX - TestHelpers.draggable.unreliableOffset, + top: before.top + offsetY - cursorAtY + deltaY - TestHelpers.draggable.unreliableOffset }; el.simulate("mousedown", pos); |