From: scottjehl <scott@scottjehl.com>
Date: Wed, 19 Jan 2011 17:32:57 +0000 (-0500)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: http://git.asbjorn.biz/?p=jquery.git;a=commitdiff_plain;h=cb1f7eeac5073748ae6200f2f960fb330ec966a8;hp=265cf0efa7ab3296b3fc4917b863d7b09e3d8bb4

Merge remote branch 'upstream/master'
---

diff --git a/src/dimensions.js b/src/dimensions.js
index 17b4f8f..9d8c354 100644
--- a/src/dimensions.js
+++ b/src/dimensions.js
@@ -36,7 +36,7 @@ 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 ];
+				elem.document.body[ "client" + name ] || window.screen && window.screen[ name.toLowerCase() ];
 
 		// Get document width or height
 		} else if ( elem.nodeType === 9 ) {