From 9c454998646ef49f652bc919f53503ed07a1c55c Mon Sep 17 00:00:00 2001 From: Yoshiya Hinosawa Date: Tue, 16 Jul 2019 13:19:26 +0900 Subject: Support window.onload (#2643) --- js/dom_util.ts | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'js/dom_util.ts') diff --git a/js/dom_util.ts b/js/dom_util.ts index 2f22a4b51..7a5dc80b9 100644 --- a/js/dom_util.ts +++ b/js/dom_util.ts @@ -9,16 +9,18 @@ export function isNode(nodeImpl: domTypes.EventTarget | null): boolean { export function isShadowRoot(nodeImpl: domTypes.EventTarget | null): boolean { return Boolean( nodeImpl && - nodeImpl.nodeType === domTypes.NodeType.DOCUMENT_FRAGMENT_NODE && - "host" in nodeImpl + nodeImpl[domTypes.eventTargetNodeType] === + domTypes.NodeType.DOCUMENT_FRAGMENT_NODE && + nodeImpl[domTypes.eventTargetHost] != null ); } export function isSlotable(nodeImpl: domTypes.EventTarget | null): boolean { return Boolean( nodeImpl && - (nodeImpl.nodeType === domTypes.NodeType.ELEMENT_NODE || - nodeImpl.nodeType === domTypes.NodeType.TEXT_NODE) + (nodeImpl[domTypes.eventTargetNodeType] === + domTypes.NodeType.ELEMENT_NODE || + nodeImpl[domTypes.eventTargetNodeType] === domTypes.NodeType.TEXT_NODE) ); } @@ -36,7 +38,7 @@ export function isShadowInclusiveAncestor( } if (isShadowRoot(node)) { - node = node && node.host; + node = node && node[domTypes.eventTargetHost]; } else { node = null; // domSymbolTree.parent(node); } @@ -77,7 +79,7 @@ export function retarget( return a; } - a = aRoot.host; + a = aRoot[domTypes.eventTargetHost]; } } } -- cgit v1.2.3