deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source
This commit is contained in:
John Resig 2011-01-20 14:39:57 -05:00
commit c97b6ee36a
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/dimensions.js
View file

@ -35,8 +35,10 @@ jQuery.each([ "Height", "Width" ], function( i, name ) {
if ( jQuery.isWindow( elem ) ) { if ( jQuery.isWindow( elem ) ) {
// Everyone else use document.documentElement or document.body depending on Quirks vs Standards mode // 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 // Get document width or height
} else if ( elem.nodeType === 9 ) { } else if ( elem.nodeType === 9 ) {