diff options
author | jeresig <jeresig@gmail.com> | 2010-09-09 16:33:05 -0400 |
---|---|---|
committer | jeresig <jeresig@gmail.com> | 2010-09-09 16:33:05 -0400 |
commit | cb3a9c14f1d69a60777a887a7807d7d11c5cb0a1 (patch) | |
tree | ff63268e947e61b8bb2b91320597b71c96ffdfcf | |
parent | c168c30a6afb1b3af1dee81119dbfdd3bef50d61 (diff) | |
download | jquery-cb3a9c14f1d69a60777a887a7807d7d11c5cb0a1.tar.gz jquery-cb3a9c14f1d69a60777a887a7807d7d11c5cb0a1.zip |
Make sure that height/width methods return numbers instead of strings.
-rw-r--r-- | src/dimensions.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/dimensions.js b/src/dimensions.js index 58c16af8d..d3561e822 100644 --- a/src/dimensions.js +++ b/src/dimensions.js @@ -8,14 +8,14 @@ jQuery.each([ "Height", "Width" ], function( i, name ) { // innerHeight and innerWidth jQuery.fn["inner" + name] = function() { return this[0] ? - jQuery.css( this[0], type, undefined, false, "padding" ) : + parseFloat( jQuery.css( this[0], type, undefined, false, "padding" ), 10 ) : null; }; // outerHeight and outerWidth jQuery.fn["outer" + name] = function( margin ) { return this[0] ? - jQuery.css( this[0], type, undefined, false, margin ? "margin" : "border" ) : + parseFloat( jQuery.css( this[0], type, undefined, false, margin ? "margin" : "border" ), 10 ) : null; }; @@ -50,7 +50,7 @@ jQuery.each([ "Height", "Width" ], function( i, name ) { // Get or set width or height on the element size === undefined ? // Get width or height on the element - jQuery.css( elem, type ) : + parseFloat( jQuery.css( elem, type ), 10 ) : // Set the width or height on the element (default to pixels if value is unitless) this.css( type, typeof size === "string" ? size : size + "px" ); |