Merge branch 'master' into selectmenu

1 files changed, 36 insertions, 26 deletions

diff --git a/tests/unit/dialog/dialog_deprecated.js b/tests/unit/dialog/dialog_deprecated.js
index fcbd22faa..57f360544 100644
--- a/tests/unit/dialog/dialog_deprecated.js
+++ b/tests/unit/dialog/dialog_deprecated.js
@@ -1,31 +1,41 @@
 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 );
-	var el = $('<div></div>').dialog({ position: [10, 10] }),
-		dialog = el.dialog('widget'),
+	var el = $("<div></div>").dialog({ position: [10, 10] }),
+		dialog = el.dialog("widget"),
 		offset = dialog.offset();
 	closeEnough(offset.left, 10 + $(window).scrollLeft(), 1);
 	closeEnough(offset.top, 10 + $(window).scrollTop(), 1);
@@ -34,8 +44,8 @@ test("position, offset from top left w/array", function() {
 
 test("position, top on window", function() {
 	expect( 2 );
-	var el = $('<div></div>').dialog({ position: "top" }),
-		dialog = el.dialog('widget'),
+	var el = $("<div></div>").dialog({ position: "top" }),
+		dialog = el.dialog("widget"),
 		offset = dialog.offset();
 	closeEnough(offset.left, Math.round($(window).width() / 2 - dialog.outerWidth() / 2) + $(window).scrollLeft(), 1);
 	closeEnough(offset.top, $(window).scrollTop(), 1);
@@ -44,8 +54,8 @@ test("position, top on window", function() {
 
 test("position, left on window", function() {
 	expect( 2 );
-	var el = $('<div></div>').dialog({ position: "left" }),
-		dialog = el.dialog('widget'),
+	var el = $("<div></div>").dialog({ position: "left" }),
+		dialog = el.dialog("widget"),
 		offset = dialog.offset();
 	closeEnough(offset.left, 0, 1);
 	closeEnough(offset.top, Math.round($(window).height() / 2 - dialog.outerHeight() / 2) + $(window).scrollTop(), 1);