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

…ttjehl-master
jquery · Jan 20, 2011 · c97b6ee · c97b6ee
2 parents 35875ac + 2b64b1d
commit c97b6ee
Showing 1 changed file with 4 additions and 2 deletions.
diff --git 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 ] ||
+			// 3rd condition allows Nokia support, as it supports the docElem prop but not CSS1Compat
-				elem.document.body[ "client" + name ];
+			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 ) {