diff options
author | Mike Sherov <mike.sherov@gmail.com> | 2012-05-29 08:46:00 -0400 |
---|---|---|
committer | Dave Methvin <dave.methvin@gmail.com> | 2012-05-31 09:24:44 -0700 |
commit | ba70f8aeb60038ae73b188e432c471f3b115a790 (patch) | |
tree | d9291a4d5ad5e0491917e4cf20b8aab221290ed8 /test/unit/dimensions.js | |
parent | 742872984e000ff8e13b9a23e74852d1b549f161 (diff) | |
download | jquery-ba70f8aeb60038ae73b188e432c471f3b115a790.tar.gz jquery-ba70f8aeb60038ae73b188e432c471f3b115a790.zip |
Fix #11724, $(document).height() in Firefox 12. Closes gh-802.
This reopens #3838 for IE6 which is a regression on a fix in 1.7.2, but we'd rather break a really old IE than a really recent Firefox.
Diffstat (limited to 'test/unit/dimensions.js')
-rw-r--r-- | test/unit/dimensions.js | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/unit/dimensions.js b/test/unit/dimensions.js index e2cf6c003..49f6bcbad 100644 --- a/test/unit/dimensions.js +++ b/test/unit/dimensions.js @@ -405,16 +405,16 @@ test("setters with and without box-sizing:border-box", function(){ equal( el.outerHeight( 129, true ).height(), expected + 5, "test border-box innerHeight(int, true) by roundtripping" ); }); -testIframe("dimensions/documentSmall", "window vs. small document", function( jQuery, window, document ) { +testIframe( "dimensions/documentSmall", "window vs. small document", function( jQuery, window, document ) { 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" ); }); -testIframe("dimensions/documentLarge", "window vs. large document", function( jQuery, window, document ) { +testIframe( "dimensions/documentLarge", "window vs. large document", function( jQuery, window, document ) { expect(2); - ok( jQuery( document ).height() > jQuery( window ).height(), "document height is larger than window height"); - ok( jQuery( document ).width() > jQuery( window ).width(), "document width is larger than window width"); + ok( jQuery( document ).height() > jQuery( window ).height(), "document height is larger than window height" ); + ok( jQuery( document ).width() > jQuery( window ).width(), "document width is larger than window width" ); }); |