X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fdimensions.js;h=7ca33794c951bfc8e3a8201ef498f3b878c66e8f;hb=9dc6e0c572b9c809a3a4c123071d96d48a01dd1c;hp=d3561e822e860f402500d47a5b354318f63a9603;hpb=cb3a9c14f1d69a60777a887a7807d7d11c5cb0a1;p=jquery.git diff --git a/src/dimensions.js b/src/dimensions.js index d3561e8..7ca3379 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] ? - parseFloat( jQuery.css( this[0], type, undefined, false, "padding" ), 10 ) : + parseFloat( jQuery.css( this[0], type, "padding" ) ) : null; }; // outerHeight and outerWidth jQuery.fn["outer" + name] = function( margin ) { return this[0] ? - parseFloat( jQuery.css( this[0], type, undefined, false, margin ? "margin" : "border" ), 10 ) : + parseFloat( jQuery.css( this[0], type, margin ? "margin" : "border" ) ) : 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 - parseFloat( jQuery.css( elem, type ), 10 ) : + parseFloat( jQuery.css( elem, type ) ) : // Set the width or height on the element (default to pixels if value is unitless) this.css( type, typeof size === "string" ? size : size + "px" );