Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move non-webcomponents script unresolved case to load instead of synchronous #1724

Merged
merged 1 commit into from
Jun 4, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/lib/unresolved.html
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -22,7 +22,11 @@
if (window.WebComponents) {
addEventListener('WebComponentsReady', resolve);
} else {
resolve();
if (document.readyState === 'interactive' || document.readyState === 'complete') {
resolve();
} else {
addEventListener('DOMContentLoaded', resolve);
}
}

})();
Expand Down
3 changes: 2 additions & 1 deletion test/runner.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
34 changes: 34 additions & 0 deletions test/unit/script-after-import-in-head.html
Original file line number Diff line number Diff line change
@@ -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>