diff options
Diffstat (limited to 'bower_components/jquery/src/css')
| -rw-r--r-- | bower_components/jquery/src/css/curCSS.js | 9 | ||||
| -rw-r--r-- | bower_components/jquery/src/css/support.js | 2 |
2 files changed, 10 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 ) { diff --git a/bower_components/jquery/src/css/support.js b/bower_components/jquery/src/css/support.js index 4a8fc87..05f5cc8 100644 --- a/bower_components/jquery/src/css/support.js +++ b/bower_components/jquery/src/css/support.js @@ -120,6 +120,8 @@ define([ reliableMarginRightVal = !parseFloat( ( window.getComputedStyle( contents, null ) || {} ).marginRight ); + + div.removeChild( contents ); } // Support: IE8 |