jQuery UI Position Test Suite

From 2582bfab46613da613f1a3354bc733b68a110b95 Mon Sep 17 00:00:00 2001 From: Scott González Date: Thu, 25 Oct 2012 06:39:14 -0400 Subject: Position: Removed offset option. Fixes #6982 - Position: Remove offset option. --- tests/unit/all-active.html | 1 - tests/unit/all.html | 1 - tests/unit/position/position.html | 3 -- tests/unit/position/position_deprecated.html | 56 ---------------------------- tests/unit/position/position_deprecated.js | 33 ---------------- tests/unit/subsuite.js | 2 +- tests/visual/position/position_feedback.html | 29 +++++++------- tests/visual/tooltip/tooltip.html | 6 +-- 8 files changed, 17 insertions(+), 114 deletions(-) delete mode 100644 tests/unit/position/position_deprecated.html delete mode 100644 tests/unit/position/position_deprecated.js (limited to 'tests') diff --git a/tests/unit/all-active.html b/tests/unit/all-active.html index 236411475..fe3e05682 100644 --- a/tests/unit/all-active.html +++ b/tests/unit/all-active.html @@ -27,7 +27,6 @@ "effects/effects.html", "menu/menu.html", "position/position.html", - "position/position_deprecated.html", "progressbar/progressbar.html", //"resizable/resizable.html", //"selectable/selectable.html", diff --git a/tests/unit/all.html b/tests/unit/all.html index e8dac887c..f3e5b33c1 100644 --- a/tests/unit/all.html +++ b/tests/unit/all.html @@ -27,7 +27,6 @@ "effects/effects.html", "menu/menu.html", "position/position.html", - "position/position_deprecated.html", "progressbar/progressbar.html", //"resizable/resizable.html", //"selectable/selectable.html", diff --git a/tests/unit/position/position.html b/tests/unit/position/position.html index 8738ae667..f3b1ad86c 100644 --- a/tests/unit/position/position.html +++ b/tests/unit/position/position.html @@ -5,9 +5,6 @@ jQuery UI Position Test Suite - diff --git a/tests/unit/position/position_deprecated.html b/tests/unit/position/position_deprecated.html deleted file mode 100644 index 84aae61f8..000000000 --- a/tests/unit/position/position_deprecated.html +++ /dev/null @@ -1,56 +0,0 @@ - - - - - jQuery UI Position Test Suite - - - - - - - - - - - - - - - - -

- - - -

- -

- - - diff --git a/tests/unit/position/position_deprecated.js b/tests/unit/position/position_deprecated.js deleted file mode 100644 index 789d4e608..000000000 --- a/tests/unit/position/position_deprecated.js +++ /dev/null @@ -1,33 +0,0 @@ -(function( $ ) { - -test( "offset", function() { - expect( 3 ); - $( "#elx" ).position({ - my: "left top", - at: "left bottom", - of: "#parentx", - offset: "10", - collision: "none" - }); - deepEqual( $( "#elx" ).offset(), { top: 70, left: 50 }, "single value" ); - - $( "#elx" ).position({ - my: "left top", - at: "left bottom", - of: "#parentx", - offset: "5 -3", - collision: "none" - }); - deepEqual( $( "#elx" ).offset(), { top: 57, left: 45 }, "two values" ); - - $( "#elx" ).position({ - my: "left top", - at: "left bottom", - of: "#parentx", - offset: "5px -3px", - collision: "none" - }); - deepEqual( $( "#elx" ).offset(), { top: 57, left: 45 }, "with units" ); -}); - -}( jQuery ) ); diff --git a/tests/unit/subsuite.js b/tests/unit/subsuite.js index b583bbd75..148f35b1e 100644 --- a/tests/unit/subsuite.js +++ b/tests/unit/subsuite.js @@ -7,7 +7,7 @@ var versions = [ "git" ], additionalTests = { - position: [ "position_deprecated.html" ] + // component: [ "other_test.html" ] }; window.testAllVersions = function( widget ) { diff --git a/tests/visual/position/position_feedback.html b/tests/visual/position/position_feedback.html index fe1f04e5b..fb3bf00fd 100644 --- a/tests/visual/position/position_feedback.html +++ b/tests/visual/position/position_feedback.html @@ -55,25 +55,24 @@ }); element.width( 150 ); - $( document ).on( "mousemove", function( event ) { - var base = { + function positionWithOffset( horizontal, vertical ) { + return { my: "left top", - at: "left top", + at: "left" + (horizontal < 0 ? horizontal : "+" + horizontal) + " " + + "top" + (vertical < 0 ? vertical : "+" + vertical), of: target, using: using }; - element.position( $.extend({ - offset: (event.pageX - targetOffset.left) + " " + (event.pageY - targetOffset.top) - }, base )); - oppositeElement.position( $.extend({ - offset: (-1 * (event.pageX - targetOffset.left)) + " " + (-1 * (event.pageY - targetOffset.top)) - }, base )); - leftElement.position( $.extend({ - offset: (-0.9 * (event.pageX - targetOffset.left)) + " " + (0.9 * (event.pageY - targetOffset.top)) - }, base )); - rightElement.position( $.extend({ - offset: (0.9 * (event.pageX - targetOffset.left)) + " " + (-0.9 * (event.pageY - targetOffset.top)) - }, base) ); + }; + $( document ).on( "mousemove", function( event ) { + element.position( positionWithOffset( + event.pageX - targetOffset.left, event.pageY - targetOffset.top ) ); + oppositeElement.position( positionWithOffset( + -1 * (event.pageX - targetOffset.left), -1 * (event.pageY - targetOffset.top) ) ); + leftElement.position( positionWithOffset( + -0.9 * (event.pageX - targetOffset.left), 0.9 * (event.pageY - targetOffset.top) ) ); + rightElement.position( positionWithOffset( + 0.9 * (event.pageX - targetOffset.left), -0.9 * (event.pageY - targetOffset.top) ) ); }); }); diff --git a/tests/visual/tooltip/tooltip.html b/tests/visual/tooltip/tooltip.html index 598af0ee8..706ed5091 100644 --- a/tests/visual/tooltip/tooltip.html +++ b/tests/visual/tooltip/tooltip.html @@ -66,8 +66,7 @@ tooltipClass: "ui-state-highlight", position: { my: "center top", - at: "center bottom", - offset: "0 10" + at: "center bottom+10" } }); @@ -86,8 +85,7 @@ $( "#buttons" ).tooltip({ position: { my: "center bottom", - at: "center top", - offset: "0 -5" + at: "center top-5" } }); -- cgit v1.2.3