X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fcore.js;h=3fb59f8d5e52f68303023c2549c7ab895318f10b;hb=139b03af7c2d7e70a26591424f82f09a02132198;hp=bedafdce2fb93e769aaad449406a9ab096b139cd;hpb=052aa1445a780f69576a800836be73b57b62a909;p=jquery.git

diff --git a/src/core.js b/src/core.js
index bedafdc..3fb59f8 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" );
 	};
 });