diff options
| author |   Agustin Henze <tin@sluc.org.ar> | 2015-07-08 07:35:06 -0300 |
|---|---|---|
| committer | Agustin Henze <tin@sluc.org.ar> | 2015-07-08 07:35:06 -0300 |
| commit | 055d72d76b44b0e627c8a17c48dbecd62e44197b (patch) | |
| tree | e2c8d5475477c46115461fe9547c1ee797873635 /bower_components/jquery/src/css/curCSS.js | |
| parent | 61f3aad02cd6492cb38e41b66f2ed8ec56e98981 (diff) | |
| parent | b0b24795b24ee6809397fbbadf42f31f310a219f (diff) | |
Merge tag 'upstream/7.6.0'
Upstream version 7.6.0
Diffstat (limited to 'bower_components/jquery/src/css/curCSS.js')
| -rw-r--r-- | bower_components/jquery/src/css/curCSS.js | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/bower_components/jquery/src/css/curCSS.js b/bower_components/jquery/src/css/curCSS.js index 1f3b734..9ab4f11 100644 --- a/bower_components/jquery/src/css/curCSS.js +++ b/bower_components/jquery/src/css/curCSS.js @@ -11,7 +11,14 @@ var getStyles, curCSS, if ( window.getComputedStyle ) { getStyles = function( elem ) { - return elem.ownerDocument.defaultView.getComputedStyle( elem, null ); + // Support: IE<=11+, Firefox<=30+ (#15098, #14150) + // IE throws on elements created in popups + // FF meanwhile throws on frame elements through "defaultView.getComputedStyle" + if ( elem.ownerDocument.defaultView.opener ) { + return elem.ownerDocument.defaultView.getComputedStyle( elem, null ); + } + + return window.getComputedStyle( elem, null ); }; curCSS = function( elem, name, computed ) { |