From: jeresig <jeresig@gmail.com>
Date: Mon, 1 Nov 2010 23:04:59 +0000 (-0400)
Subject: Make sure that accessing computed CSS for elements returns 'auto' instead of '' consi... 
X-Git-Tag: 1.4.4rc2~3
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=9d1bfeb7ffe63b5a7488929b7be847bc1a00f6a6;p=jquery.git

Make sure that accessing computed CSS for elements returns 'auto' instead of '' consistently. Fixes #7337.
---

diff --git a/src/css.js b/src/css.js
index 30cecf39d..0998657b0 100644
--- a/src/css.js
+++ b/src/css.js
@@ -173,12 +173,13 @@ jQuery.each(["height", "width"], function( i, name ) {
 					val = curCSS( elem, name, name );
 
 					if ( val != null ) {
-						return val === "auto" ? "" : val;
+						return val;
 					}
 				}
 
 				if ( val < 0 || val == null ) {
-					return elem.style[ name ];
+					val = elem.style[ name ];
+					return val === "" ? "auto" : val;
 				}
 
 				return typeof val === "string" ? val : val + "px";
@@ -247,7 +248,7 @@ if ( getComputedStyle ) {
 			}
 		}
 
-		return ret;
+		return ret === "" ? "auto" : ret;
 	};
 
 } else if ( document.documentElement.currentStyle ) {
@@ -274,7 +275,7 @@ if ( getComputedStyle ) {
 			elem.runtimeStyle.left = rsLeft;
 		}
 
-		return ret;
+		return ret === "" ? "auto" : ret;
 	};
 }
 
diff --git a/test/unit/css.js b/test/unit/css.js
index 4ec7c60ae..71f883508 100644
--- a/test/unit/css.js
+++ b/test/unit/css.js
@@ -13,8 +13,8 @@ test("css(String|Hash)", function() {
 
 	var div = jQuery( "<div>" );
 
-	equals( div.css("width"), "", "Width on disconnected node." );
-	equals( div.css("height"), "", "Height on disconnected node." );
+	equals( div.css("width"), "auto", "Width on disconnected node." );
+	equals( div.css("height"), "auto", "Height on disconnected node." );
 
 	div.css({ width: 4, height: 4 });