diff options
| author | timmywil <tim.willison@thisismedium.com> | 2011-05-25 19:49:50 -0400 |
|---|---|---|
| committer | timmywil <tim.willison@thisismedium.com> | 2011-05-25 19:49:50 -0400 |
| commit | edb2286544270dc53550180e06668e61c231fb5d (patch) | |
| tree | e89dae0250f8c57839e160d2a4d5cf7e104b562b /src/css.js | |
| parent | 1d1cb582c0f744afaa51a63d374b9ffe0f58d1db (diff) | |
| download | jquery-edb2286544270dc53550180e06668e61c231fb5d.tar.gz jquery-edb2286544270dc53550180e06668e61c231fb5d.zip | |
Return null for outer/inner width/height calls on window/document. Fixes #7557.
Diffstat (limited to 'src/css.js')
| -rw-r--r-- | src/css.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/css.js b/src/css.js index 46f6bf31f..10d36b765 100644 --- a/src/css.js +++ b/src/css.js @@ -170,6 +170,11 @@ jQuery.each(["height", "width"], function( i, name ) { get: function( elem, computed, extra ) { var val; + // Tests for window/document + if ( !elem.style ) { + return null; + } + if ( computed ) { if ( elem.offsetWidth !== 0 ) { val = getWH( elem, name, extra ); @@ -196,7 +201,6 @@ jQuery.each(["height", "width"], function( i, name ) { if ( val < 0 || val == null ) { val = elem.style[ name ]; - // Should return "auto" instead of 0, use 0 for // temporary backwards-compat return val === "" || val === "auto" ? "0px" : val; |