aboutsummaryrefslogtreecommitdiffstats
path: root/tests/unit/dialog/dialog_deprecated.js
diff options
context:
space:
mode:
authorMike Sherov <mike.sherov@gmail.com>2012-12-22 15:46:57 -0500
committerMike Sherov <mike.sherov@gmail.com>2012-12-22 15:46:57 -0500
commit6d88d264be5800badd9fc083ccc238ca187bd953 (patch)
tree05f8d1a93a253b1a57e519c7dbdbc3208a529726 /tests/unit/dialog/dialog_deprecated.js
parent48d7d53f7b04e202e32a47aa0665f83a1179b723 (diff)
downloadjquery-ui-6d88d264be5800badd9fc083ccc238ca187bd953.tar.gz
jquery-ui-6d88d264be5800badd9fc083ccc238ca187bd953.zip
Dialog Tests: Fix test fails due to window measurements in FF and IE7
Diffstat (limited to 'tests/unit/dialog/dialog_deprecated.js')
-rw-r--r--tests/unit/dialog/dialog_deprecated.js50
1 files changed, 30 insertions, 20 deletions
diff --git a/tests/unit/dialog/dialog_deprecated.js b/tests/unit/dialog/dialog_deprecated.js
index fcbd22faa..918190791 100644
--- a/tests/unit/dialog/dialog_deprecated.js
+++ b/tests/unit/dialog/dialog_deprecated.js
@@ -1,26 +1,36 @@
module("dialog (deprecated): position option with string and array");
-if ( !$.ui.ie ) {
- test("position, right bottom on window w/array", function() {
- expect( 2 );
- var el = $('<div></div>').dialog({ position: ["right", "bottom"] }),
- dialog = el.dialog('widget'),
- offset = dialog.offset();
- closeEnough(offset.left, $(window).width() - dialog.outerWidth() + $(window).scrollLeft(), 1);
- closeEnough(offset.top, $(window).height() - dialog.outerHeight() + $(window).scrollTop(), 1);
- el.remove();
- });
+test( "position, right bottom on window w/array", function() {
+ expect( 2 );
+
+ // dialogs alter the window width and height in FF and IE7
+ // so we collect that information before creating the dialog
+ // Support: FF, IE7
+ var winWidth = $( window ).width(),
+ winHeight = $( window ).height(),
+ el = $("<div></div>").dialog({ position: [ "right", "bottom" ] }),
+ dialog = el.dialog("widget"),
+ offset = dialog.offset();
+ closeEnough( offset.left, winWidth - dialog.outerWidth() + $( window ).scrollLeft(), 1, "offset left of right bottom on window w/array" );
+ closeEnough( offset.top, winHeight - dialog.outerHeight() + $( window ).scrollTop(), 1, "offset top of right bottom on window w/array" );
+ el.remove();
+});
- test("position, right bottom on window", function() {
- expect( 2 );
- var el = $('<div></div>').dialog({ position: "right bottom" }),
- dialog = el.dialog('widget'),
- offset = dialog.offset();
- closeEnough(offset.left, $(window).width() - dialog.outerWidth() + $(window).scrollLeft(), 1);
- closeEnough(offset.top, $(window).height() - dialog.outerHeight() + $(window).scrollTop(), 1);
- el.remove();
- });
-}
+test( "position, right bottom on window", function() {
+ expect( 2 );
+
+ // dialogs alter the window width and height in FF and IE7
+ // so we collect that information before creating the dialog
+ // Support: FF, IE7
+ var winWidth = $( window ).width(),
+ winHeight = $( window ).height(),
+ el = $("<div></div>").dialog({ position: "right bottom" }),
+ dialog = el.dialog("widget"),
+ offset = dialog.offset();
+ closeEnough( offset.left, winWidth - dialog.outerWidth() + $( window ).scrollLeft(), 1, "offset left of right bottom on window" );
+ closeEnough( offset.top, winHeight - dialog.outerHeight() + $( window ).scrollTop(), 1, "offset top of right bottom on window" );
+ el.remove();
+});
test("position, offset from top left w/array", function() {
expect( 2 );