From 3a0d582cf63b6e8f77150d9c38d2bf34d0c7790e Mon Sep 17 00:00:00 2001 From: Thomas Tortorini Date: Sun, 14 Jun 2015 23:58:44 +0200 Subject: [PATCH] CSS: make the getStyles function more readable The new version is not only simpler to read but also smaller by 6 bytes gzipped. Closes gh-2393 --- src/css/var/getStyles.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/css/var/getStyles.js b/src/css/var/getStyles.js index 0d1d51af6..31dfc298e 100644 --- a/src/css/var/getStyles.js +++ b/src/css/var/getStyles.js @@ -1,12 +1,15 @@ define(function() { return function( elem ) { + // 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 ); + var view = elem.ownerDocument.defaultView; + + if ( !view.opener ) { + view = window; } - return window.getComputedStyle( elem ); + return view.getComputedStyle( elem ); }; }); -- 2.39.5