library-mirrors/jquery-ui
1
0
Fork 0
mirror of https://github.com/jquery/jquery-ui.git synced 2025-01-07 20:34:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Dev: Fix test failures in oldIE. Fixed #8748 - Dev: Get draggable test suite to pass

Browse Source
This commit is contained in:
Mike Sherov 2012-10-31 09:55:23 -04:00 committed by Scott González
parent d85b0160f2
commit d771048a56
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/unit/draggable/draggable_core.js
View File

@ -4,6 +4,9 @@
TestHelpers.draggable = {}; 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) { TestHelpers.draggable.drag = function(handle, dx, dy) {
$(handle).simulate("drag", { $(handle).simulate("drag", {
dx: dx || 0, dx: dx || 0,
@ -57,10 +60,10 @@ TestHelpers.draggable.setScroll = function( what ) {
}; };
TestHelpers.draggable.border = function(el, side) { 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) { TestHelpers.draggable.margin = function(el, side) {
return parseInt(el.css('margin-' + side), 10); return parseInt(el.css('margin-' + side), 10) || 0;
}; };
(function($) { (function($) {

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

@ -281,8 +281,8 @@ test("{ cursorAt: { left: -5, top: -5 } }", function() {
clientY: before.top + offsetY clientY: before.top + offsetY
}; };
expected = { expected = {
left: before.left + offsetX - cursorAtX + deltaX, left: before.left + offsetX - cursorAtX + deltaX - TestHelpers.draggable.unreliableOffset,
top: before.top + offsetY - cursorAtY + deltaY top: before.top + offsetY - cursorAtY + deltaY - TestHelpers.draggable.unreliableOffset
}; };
el.simulate("mousedown", pos); el.simulate("mousedown", pos);
@ -315,8 +315,8 @@ test("{ cursorAt: { right: 10, bottom: 20 } }", function() {
clientY: before.top + offsetY clientY: before.top + offsetY
}; };
expected = { expected = {
left: before.left + offsetX - el.width() + cursorAtX + deltaX, left: before.left + offsetX - el.width() + cursorAtX + deltaX - TestHelpers.draggable.unreliableOffset,
top: before.top + offsetY - el.height() + cursorAtY + deltaY top: before.top + offsetY - el.height() + cursorAtY + deltaY - TestHelpers.draggable.unreliableOffset
}; };
el.simulate("mousedown", pos); el.simulate("mousedown", pos);
@ -349,8 +349,8 @@ test("{ cursorAt: [10, 20] }", function() {
clientY: before.top + offsetY clientY: before.top + offsetY
}; };
expected = { expected = {
left: before.left + offsetX - cursorAtX + deltaX, left: before.left + offsetX - cursorAtX + deltaX - TestHelpers.draggable.unreliableOffset,
top: before.top + offsetY - cursorAtY + deltaY top: before.top + offsetY - cursorAtY + deltaY - TestHelpers.draggable.unreliableOffset
}; };
el.simulate("mousedown", pos); el.simulate("mousedown", pos);
@ -383,8 +383,8 @@ test("{ cursorAt: '20, 40' }", function() {
clientY: before.top + offsetY clientY: before.top + offsetY
}; };
expected = { expected = {
left: before.left + offsetX - cursorAtX + deltaX, left: before.left + offsetX - cursorAtX + deltaX - TestHelpers.draggable.unreliableOffset,
top: before.top + offsetY - cursorAtY + deltaY top: before.top + offsetY - cursorAtY + deltaY - TestHelpers.draggable.unreliableOffset
}; };
el.simulate("mousedown", pos); el.simulate("mousedown", pos);