Merge pull request #1724 from Polymer/fix-scripts-head-unresolved

Steve Orvell · Steve Orvell · commit b8ffcdd6707b · 2015-06-04T10:31:23.000-07:00
Move non-webcomponents script unresolved case to `load` instead of synchronous
diff --git a/src/lib/unresolved.html b/src/lib/unresolved.html
@@ -9,7 +9,7 @@
 -->
 <script>
 (function() {
-  
+
   // Ensure that the `unresolved` attribute added by the WebComponents polyfills
   // is removed. This is done as a convenience so users don't have to remember
   // to do so themselves. This attribute provides FOUC prevention when
@@ -22,7 +22,11 @@
   if (window.WebComponents) {
     addEventListener('WebComponentsReady', resolve);
   } else {
-    resolve();
+    if (document.readyState === 'interactive' || document.readyState === 'complete') {
+      resolve();
+    } else {
+      addEventListener('DOMContentLoaded', resolve);
+    }
   }
 
 })();
diff --git a/test/runner.html b/test/runner.html
@@ -48,7 +48,8 @@
       'unit/dynamic-import.html',
       'unit/dom-repeat.html',
       'unit/dom-if.html',
-      'unit/dom-bind.html'
+      'unit/dom-bind.html',
+      'unit/script-after-import-in-head.html'
     ]);
   </script>
 </body>
diff --git a/test/unit/script-after-import-in-head.html b/test/unit/script-after-import-in-head.html
@@ -0,0 +1,34 @@
+<!doctype html>
+<!--
+@license
+Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+-->
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <script src="../../../web-component-tester/browser.js"></script>
+  <script>
+    var shouldRun = 'import' in document.createElement('link');
+  </script>
+  <link rel="import" href="../../polymer.html">
+  <script>var SCRIPT_AFTER_IMPORT_IN_HEAD = true;</script>
+</head>
+<body>
+
+  <script>
+    suite('head scripts', function() {
+      var t = shouldRun ? test : test.skip;
+      t('script after import in head works', function() {
+        assert(SCRIPT_AFTER_IMPORT_IN_HEAD);
+        assert.equal(document.body.getAttribute('unresolved'), null);
+      });
+    });
+  </script>
+
+</body>
+</html>
