Merge pull request #537 from Polymer/wc-ready-check

Better check for whether to listen for `WebComponentsReady` event
Polymer · Apr 24, 2017 · 2877765 · 2877765
2 parents ad59963 + f533c18
commit 2877765
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/browser.js b/browser.js
diff --git a/browser.js.map b/browser.js.map
diff --git a/browser/util.js b/browser/util.js
@@ -22,7 +22,7 @@ export function whenFrameworksReady(callback) {
   };
 
   // If webcomponents script is in the document, wait for WebComponentsReady.
-  if (document.querySelector('script[src*="webcomponents"]')) {
+  if (window.WebComponents && !window.WebComponents.ready) {
     debug('WebComponentsReady?');
     window.addEventListener('WebComponentsReady', function wcReady() {
       window.removeEventListener('WebComponentsReady', wcReady);