From: John Resig Date: Sun, 9 Sep 2007 22:59:41 +0000 (+0000) Subject: Landing a version of $(document)/$(window) .width()/.height(). It won't win any award... X-Git-Tag: 1.2~5 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=139b03af7c2d7e70a26591424f82f09a02132198;p=jquery.git Landing a version of $(document)/$(window) .width()/.height(). It won't win any awards, but it'll hold us over for this release. --- diff --git a/src/core.js b/src/core.js index bedafdce2..3fb59f8d5 100644 --- a/src/core.js +++ b/src/core.js @@ -1080,10 +1080,20 @@ jQuery.each( { }; }); -jQuery.each( [ "height", "width" ], function(i,n){ +jQuery.each( [ "Height", "Width" ], function(i,name){ + var n = name.toLowerCase(); + jQuery.fn[ n ] = function(h) { - return h == undefined ? - ( this.length ? jQuery.css( this[0], n ) : null ) : - this.css( n, h.constructor == String ? h : h + "px" ); + return this[0] == window ? + jQuery.browser.safari && self["inner" + name] || + jQuery.boxModel && Math.max(document.documentElement["client" + name], document.body["client" + name]) || + document.body["client" + name] : + + this[0] == document ? + Math.max( document.body["scroll" + name], document.body["offset" + name] ) : + + h == undefined ? + ( this.length ? jQuery.css( this[0], n ) : null ) : + this.css( n, h.constructor == String ? h : h + "px" ); }; });