From 33505b8369bea813f7916cdeda3e86b484f546b4 Mon Sep 17 00:00:00 2001 From: Rory Mulligan Date: Fri, 24 Feb 2017 06:32:24 -0700 Subject: [PATCH] fixes #18973, resolve cross-domain computed style issue and regression --- dom-style.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dom-style.js b/dom-style.js index b024ef589c..f2c7a4b375 100644 --- a/dom-style.js +++ b/dom-style.js @@ -45,10 +45,12 @@ define(["./sniff", "./dom", "./_base/window"], function(has, dom, win){ }; }else{ getComputedStyle = function(node){ - var dv = node.ownerDocument.defaultView, - w = dv.opener ? dv : win.global.window.parent; - return node.nodeType == 1 /* ELEMENT_NODE*/ ? - w.getComputedStyle(node, null) : {}; + if(node.nodeType === 1 /* ELEMENT_NODE*/){ + var dv = node.ownerDocument.defaultView, + w = dv.opener ? dv : win.global.window; + return w.getComputedStyle(node, null); + } + return {}; }; } style.getComputedStyle = getComputedStyle;