fixes #18973, resolve cross-domain computed style issue and regression

dojo · Feb 24, 2017 · 33505b8 · 33505b8
1 parent dba041b
commit 33505b8
Showing 1 changed file with 6 additions and 4 deletions.
diff --git 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;