X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fcss.js;h=88c4ffa05a8933ce971f381d33da4f8113ddff5f;hb=7e02cee5ff8b5e9117366d7b43af7b5794f0f258;hp=d0e55db0f4ed1b040a06e722e2374f8c01d51f10;hpb=b0dcc1746f58f5aca17a12794dd928c0deaaa6a0;p=jquery.git

diff --git a/src/css.js b/src/css.js
index d0e55db..88c4ffa 100644
--- a/src/css.js
+++ b/src/css.js
@@ -169,7 +169,23 @@ jQuery.each(["height", "width"], function( i, name ) {
 					});
 				}
 
-				return val + "px";
+				if ( val < 0 ) {
+					return elem.style[ name ] || "0px";
+				}
+
+				if ( val === 0 ) {
+					val = curCSS( elem, name, name );
+
+					if ( val != null ) {
+						return val;
+					}
+				}
+
+				if ( val < 0 || val == null ) {
+					return elem.style[ name ];
+				}
+
+				return typeof val === "string" ? val : val + "px";
 			}
 		},
 
@@ -230,6 +246,9 @@ if ( getComputedStyle ) {
 
 		if ( (computedStyle = defaultView.getComputedStyle( elem, null )) ) {
 			ret = computedStyle.getPropertyValue( name );
+			if ( ret === "" && !jQuery.contains( elem.ownerDocument.documentElement, elem ) ) {
+				ret = jQuery.style( elem, name );
+			}
 		}
 
 		return ret;