Fixe dimensions tests. No core code changes. Supplements #11856

jquery · Jun 6, 2012 · 4dcd7dd324fe7362842ce805b05f88929655fc79 · 4dcd7dd
1 parent e680f36
commit 4dcd7dd324fe7362842ce805b05f88929655fc79
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/dimensions.js b/src/dimensions.js
@@ -24,7 +24,7 @@ jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
 					doc = elem.documentElement;
 
 					// Either scroll[Width/Height] or offset[Width/Height] or client[Width/Height], whichever is greatest
-					// unfortunately, this causes bug #3838 in IE6 only, but there is currently no good, small way to fix it.
+					// unfortunately, this causes bug #3838 in IE6/8 only, but there is currently no good, small way to fix it.
 					return Math.max(
 						elem.body[ scrollProp ], doc[ scrollProp ],
 						elem.body[ offsetProp ], doc[ offsetProp ],

diff --git a/test/unit/dimensions.js b/test/unit/dimensions.js
@@ -415,10 +415,16 @@ test("setters with and without box-sizing:border-box", function(){
 });
 
 testIframe( "dimensions/documentSmall", "window vs. small document", function( jQuery, window, document ) {
-	expect(2);
+	// this test is practically tautological, but there is a bug in IE8
+	// with no simple workaround, so this test exposes the bug and works around it
+	if ( document.body.offsetWidth >= document.documentElement.offsetWidth ) {
+		expect( 2 );
 
-	equal( jQuery( document ).height(), jQuery( window ).height(), "document height matches window height" );
-	equal( jQuery( document ).width(), jQuery( window ).width(), "document width matches window width" );
+		equal( jQuery( document ).height(), jQuery( window ).height(), "document height matches window height" );
+		equal( jQuery( document ).width(), jQuery( window ).width(), "document width matches window width" );
+	} else {
+		expect( 0 );
+	}
 });
 
 testIframe( "dimensions/documentLarge", "window vs. large document", function( jQuery, window, document ) {