From d9478954b9de79a7f3538e935bfd98cdc61ee435 Mon Sep 17 00:00:00 2001 From: jeresig Date: Wed, 3 Nov 2010 18:59:55 -0400 Subject: [PATCH] Limit the scope of the CSS 'auto' change to just height/width. Fixes #7393. --- src/css.js | 4 ++-- test/unit/effects.js | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/css.js b/src/css.js index 0f14914..1fbee3f 100644 --- a/src/css.js +++ b/src/css.js @@ -177,7 +177,7 @@ jQuery.each(["height", "width"], function( i, name ) { } if ( val != null ) { - return val; + return val === "" ? "auto" : val; } } @@ -252,7 +252,7 @@ if ( document.defaultView && document.defaultView.getComputedStyle ) { } } - return ret === "" ? "auto" : ret; + return ret; }; } diff --git a/test/unit/effects.js b/test/unit/effects.js index 8facb4f..74b336f 100644 --- a/test/unit/effects.js +++ b/test/unit/effects.js @@ -6,7 +6,7 @@ test("sanity check", function() { }); test("show()", function() { - expect(27); + expect(28); var hiddendiv = jQuery("div.hidden"); @@ -14,6 +14,10 @@ test("show()", function() { equals( hiddendiv.css("display"), "block", "Make sure a pre-hidden div is visible." ); + var div = jQuery("
").hide().appendTo("body").show(); + + equal( div.css("display"), "block", "Make sure pre-hidden divs show" ); + QUnit.reset(); hiddendiv = jQuery("div.hidden"); -- 1.7.10.4