diff options
author | Thomas Park <thomas@thomaspark.me> | 2015-01-22 22:36:20 -0500 |
---|---|---|
committer | Thomas Park <thomas@thomaspark.me> | 2015-01-22 22:36:20 -0500 |
commit | 25f57ee1fe9773b08d95d5f7d6ba93e2db048f8f (patch) | |
tree | 8e4448eed6bce0fa1288321e18c2b4675b8cb393 /bower_components/jquery/src/css/var | |
parent | 0a7f9e5bb684c185d309d1ac1079dfb8b36af33c (diff) |
update bootstrap to 3.3.2
Diffstat (limited to 'bower_components/jquery/src/css/var')
-rw-r--r-- | bower_components/jquery/src/css/var/getStyles.js | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/bower_components/jquery/src/css/var/getStyles.js b/bower_components/jquery/src/css/var/getStyles.js index 26cc0a25..413acd04 100644 --- a/bower_components/jquery/src/css/var/getStyles.js +++ b/bower_components/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 ); }; }); |