From: John Resig <jeresig@gmail.com>
Date: Thu, 20 Jan 2011 19:39:57 +0000 (-0500)
Subject: Merge branch 'master' of https://github.com/scottjehl/jquery into scottjehl-master
X-Git-Url: http://git.asbjorn.it/?p=jquery.git;a=commitdiff_plain;h=c97b6ee36a1402b6f4bb3f6893b687eb294c41df;hp=35875acd03cc95eace495f887511f2b61f223f7a

Merge branch 'master' of https://github.com/scottjehl/jquery into scottjehl-master
---

diff --git a/src/dimensions.js b/src/dimensions.js
index 17b4f8f..e2d411d 100644
--- a/src/dimensions.js
+++ b/src/dimensions.js
@@ -35,8 +35,10 @@ jQuery.each([ "Height", "Width" ], function( i, name ) {
 
 		if ( jQuery.isWindow( elem ) ) {
 			// Everyone else use document.documentElement or document.body depending on Quirks vs Standards mode
-			return elem.document.compatMode === "CSS1Compat" && elem.document.documentElement[ "client" + name ] ||
-				elem.document.body[ "client" + name ];
+			// 3rd condition allows Nokia support, as it supports the docElem prop but not CSS1Compat
+			var docElemProp = elem.document.documentElement[ "client" + name ];
+			return elem.document.compatMode === "CSS1Compat" && docElemProp ||
+				elem.document.body[ "client" + name ] || docElemProp;
 
 		// Get document width or height
 		} else if ( elem.nodeType === 9 ) {