Skip to content

Commit 068d597

Browse files
committed
Dev: fix IE fails in draggable and selectable - Fixed #8770 Dev: Remove globals and Standardize Test Suite
1 parent 3df9ea2 commit 068d597

File tree

3 files changed

+8
-12
lines changed

3 files changed

+8
-12
lines changed

tests/unit/draggable/draggable_core.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ test("element types", function() {
2424
offsetBefore = el.offset();
2525
TestHelpers.draggable.drag(el, 50, 50);
2626
offsetAfter = el.offset();
27-
//there are some rounding errors in FF and Chrome, so we can't say equal, we have to settle for close enough
28-
ok(offsetAfter.left - offsetBefore.left - 50 < 1 && offsetAfter.top - offsetBefore.top - 50 < 1, 'dragged[50, 50] ' + "&lt;" + typeName + "&gt;");
27+
// there are some rounding errors in FF, Chrome, and IE9, so we can't say equal, we have to settle for close enough
28+
ok( offsetAfter.left - offsetBefore.left - 50 <= 1 && offsetAfter.top - offsetBefore.top - 50 <= 1, "dragged[50, 50] " + "&lt;" + typeName + "&gt;" );
2929
el.draggable("destroy");
3030
el.remove();
3131
});

tests/unit/selectable/selectable_options.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ test("autoRefresh", function() {
2626
TestHelpers.selectable.drag(el, 1000, 1000);
2727
equal(actual, 0);
2828
sel.show();
29-
TestHelpers.selectable.drag(el, 1000, 1000);
29+
TestHelpers.selectable.drag( sel[ 0 ], 1000, 1000 );
3030
equal(actual, sel.length);
3131
el.selectable("destroy");
3232
sel.show();
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
TestHelpers.selectable = {
2-
drag: function(el, dx, dy) {
3-
var off = el.offset(),
4-
pos = { clientX: off.left, clientY: off.top };
5-
el.simulate("mousedown", pos);
6-
$(document).simulate("mousemove", pos);
7-
pos.clientX += dx;
8-
pos.clientY += dy;
9-
$(document).simulate("mousemove", pos);
10-
$(document).simulate("mouseup", pos);
2+
drag: function( el, dx, dy ) {
3+
$( el ).simulate( "drag", {
4+
dx: dx || 0,
5+
dy: dy || 0
6+
});
117
}
128
};

0 commit comments

Comments
 (0)