diff options
author | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-12-23 12:50:15 +0100 |
---|---|---|
committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-12-23 12:50:15 +0100 |
commit | f88f8fcb7f7451babc8aa20ecc0dad06dd27e1ed (patch) | |
tree | cb53495565d3a5757b6efc44c179b6d95b244721 /js/vendor/jquery/src/css/var | |
parent | 367a4eed30e9fa77a2aa5d7924f041e967f8567d (diff) |
update jasmine, karma and angular
Diffstat (limited to 'js/vendor/jquery/src/css/var')
-rw-r--r-- | js/vendor/jquery/src/css/var/getStyles.js | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/js/vendor/jquery/src/css/var/getStyles.js b/js/vendor/jquery/src/css/var/getStyles.js index 26cc0a25e..413acd04a 100644 --- a/js/vendor/jquery/src/css/var/getStyles.js +++ b/js/vendor/jquery/src/css/var/getStyles.js @@ -1,5 +1,12 @@ define(function() { return 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 ); }; }); |