library-mirrors/jquery-ui
1
0
Fork 0
mirror of https://github.com/jquery/jquery-ui.git synced 2024-11-21 11:04:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Draggable Tests: fix old Safari and old Opera tests with jQuery < 1.8 tests by accounting for a bug in $.contains on disconnected Elements.(cherry picked from commit 3c1a3ca252)

Browse Source
This commit is contained in:
Mike Sherov 2013-04-07 12:10:59 -04:00 committed by Scott González
parent 2258e02e76
commit 17ce0a5cb0
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1289,9 +1289,15 @@ test( "#8459: element can snap to an element that was removed during drag", func
moves: 1 moves: 1
}); });
// Support: Opera 12.10, Safari 5.1, jQuery <1.8
if ( TestHelpers.draggable.unreliableContains ) {
ok( true, "Opera <12.14 and Safari <6.0 report wrong values for $.contains in jQuery < 1.8" );
ok( true, "Opera <12.14 and Safari <6.0 report wrong values for $.contains in jQuery < 1.8" );
} else {
// TODO: fix IE8 testswarm IFRAME positioning bug so closeEnough can be turned back to equal // TODO: fix IE8 testswarm IFRAME positioning bug so closeEnough can be turned back to equal
closeEnough( element.offset().left, newX, 1, "doesn't snap to a removed element" ); closeEnough( element.offset().left, newX, 1, "doesn't snap to a removed element" );
closeEnough( element.offset().top, newY, 1, "doesn't snap to a removed element" ); closeEnough( element.offset().top, newY, 1, "doesn't snap to a removed element" );
}
}); });
test( "#8165: Snapping large rectangles to small rectangles doesn't snap properly", function() { test( "#8165: Snapping large rectangles to small rectangles doesn't snap properly", function() {

5
tests/unit/draggable/draggable_test_helpers.js
View File

@ -1,6 +1,11 @@
TestHelpers.draggable = { TestHelpers.draggable = {
// todo: remove the unreliable offset hacks // todo: remove the unreliable offset hacks
unreliableOffset: $.ui.ie && ( !document.documentMode || document.documentMode < 8 ) ? 2 : 0, unreliableOffset: $.ui.ie && ( !document.documentMode || document.documentMode < 8 ) ? 2 : 0,
// Support: Opera 12.10, Safari 5.1, jQuery <1.8
unreliableContains: function(){
var element = $( "<div>" );
return $.contains( element[ 0 ].ownerDocument, element[ 0 ] );
}(),
testDrag: function(el, handle, dx, dy, expectedDX, expectedDY, msg) { testDrag: function(el, handle, dx, dy, expectedDX, expectedDY, msg) {
var offsetAfter, actual, expected, var offsetAfter, actual, expected,
offsetBefore = el.offset(); offsetBefore = el.offset();