Make sure that .width()/.height() don't return NaN also standardize on returning...

[jquery.git] / src / css.js

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