Skip to content
Permalink
Browse files

Make sure that accessing computed CSS for elements returns 'auto' ins…

…tead of '' consistently. Fixes #7337.
  • Loading branch information...
jeresig committed Nov 1, 2010
1 parent e377621 commit 9d1bfeb7ffe63b5a7488929b7be847bc1a00f6a6
Showing with 7 additions and 6 deletions.
  1. +5 −4 src/css.js
  2. +2 −2 test/unit/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;
};
}

@@ -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 });

0 comments on commit 9d1bfeb

Please sign in to comment.
You can’t perform that action at this time.