X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fcss.js;h=30cecf39d42f54c3a18d9967600a7098b4e35cc9;hb=53396b879bd29c090824da182e3cf69158829f82;hp=f2165f904c05b8afbda90992846f16d3661cfe28;hpb=e4a38670b10b1ce776afff389bae34991e986180;p=jquery.git

diff --git a/src/css.js b/src/css.js
index f2165f9..30cecf3 100644
--- a/src/css.js
+++ b/src/css.js
@@ -169,11 +169,19 @@ jQuery.each(["height", "width"], function( i, name ) {
 					});
 				}
 
-				if ( val < 0 || val === 0 && !jQuery.contains( elem.ownerDocument.documentElement, elem ) ) {
-					return elem.style[ name ] || "0px";
+				if ( val <= 0 ) {
+					val = curCSS( elem, name, name );
+
+					if ( val != null ) {
+						return val === "auto" ? "" : val;
+					}
+				}
+
+				if ( val < 0 || val == null ) {
+					return elem.style[ name ];
 				}
 
-				return val + "px";
+				return typeof val === "string" ? val : val + "px";
 			}
 		},