X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;ds=sidebyside;f=src%2Fdimensions.js;h=698f5f4b03698cecb6468fd2554fe54bf407ff4b;hb=37b607d2815b893d13de4ac3461090d0dd46535e;hp=aeaaa78ba078faa0c18ef966944b1966c3ba5645;hpb=4f9aa62a858f28b8ed310ac73f9d2cd788bf1eed;p=jquery.git diff --git a/src/dimensions.js b/src/dimensions.js index aeaaa78..698f5f4 100644 --- a/src/dimensions.js +++ b/src/dimensions.js @@ -1,3 +1,5 @@ +(function( jQuery ) { + // Create innerHeight, innerWidth, outerHeight and outerWidth methods jQuery.each([ "Height", "Width" ], function( i, name ) { @@ -6,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, false, "padding" ) : + parseFloat( jQuery.css( this[0], type, undefined, "padding" ), 10 ) : null; }; // outerHeight and outerWidth jQuery.fn["outer" + name] = function( margin ) { return this[0] ? - jQuery.css( this[0], type, false, margin ? "margin" : "border" ) : + parseFloat( jQuery.css( this[0], type, undefined, margin ? "margin" : "border" ), 10 ) : null; }; @@ -48,10 +50,12 @@ 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" ); }; }); + +})( jQuery );