X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fdimensions.js;h=58c16af8dd625e0debc069338ffb60dbde6d50a8;hb=7c8588530abaf4e72154fe1f59c04aae217a32b8;hp=3b74ded9b839c089d2faed74ce921b6eb53788f0;hpb=ddb86f8d5bd1bd21b2beeeea55baf505b47dfed5;p=jquery.git diff --git a/src/dimensions.js b/src/dimensions.js index 3b74ded..58c16af 100644 --- a/src/dimensions.js +++ b/src/dimensions.js @@ -1,26 +1,38 @@ +(function( jQuery ) { + // Create innerHeight, innerWidth, outerHeight and outerWidth methods -jQuery.each([ "Height", "Width" ], function(i, name){ +jQuery.each([ "Height", "Width" ], function( i, name ) { var type = name.toLowerCase(); // innerHeight and innerWidth - jQuery.fn["inner" + name] = function(){ + jQuery.fn["inner" + name] = function() { return this[0] ? - jQuery.css( this[0], type, false, "padding" ) : + jQuery.css( this[0], type, undefined, false, "padding" ) : null; }; // outerHeight and outerWidth - jQuery.fn["outer" + name] = function(margin) { + jQuery.fn["outer" + name] = function( margin ) { return this[0] ? - jQuery.css( this[0], type, false, margin ? "margin" : "border" ) : + jQuery.css( this[0], type, undefined, false, margin ? "margin" : "border" ) : null; }; jQuery.fn[ type ] = function( size ) { // Get window width or height var elem = this[0]; - if ( !elem ) { return null; } + if ( !elem ) { + return size == null ? null : this; + } + + if ( jQuery.isFunction( size ) ) { + return this.each(function( i ) { + var self = jQuery( this ); + self[ type ]( size.call( this, i, self[ type ]() ) ); + }); + } + return ("scrollTo" in elem && elem.document) ? // does it walk and quack like a window? // Everyone else use document.documentElement or document.body depending on Quirks vs Standards mode elem.document.compatMode === "CSS1Compat" && elem.document.documentElement[ "client" + name ] || @@ -45,3 +57,5 @@ jQuery.each([ "Height", "Width" ], function(i, name){ }; }); + +})( jQuery );