X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fdimensions.js;h=3acbb1d76a665bd0d004981d1a0e462104d80972;hb=0912109ffc86610161c769534df84400ccd1aa65;hp=a53254d5499892c741e3952225008254c2cb7ae4;hpb=9d46c0ebb46037cfcc026e874d459d2cd412294e;p=jquery.git diff --git a/src/dimensions.js b/src/dimensions.js index a53254d..3acbb1d 100644 --- a/src/dimensions.js +++ b/src/dimensions.js @@ -1,17 +1,17 @@ // 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" ) : 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" ) : null; @@ -20,7 +20,10 @@ jQuery.each([ "Height", "Width" ], function(i, name){ 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; + } + 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 ] ||