Improve waiting for window.onload
In case the window load event was fired before getting to the Ember initializer, it would pause app loading indefinitely. This makes sure that app loading is only paused, if there's still an event to wait for.
This commit is contained in:
@@ -13,6 +13,12 @@
|
|||||||
<link rel="stylesheet" href="{{rootURL}}assets/kredits-web.css">
|
<link rel="stylesheet" href="{{rootURL}}assets/kredits-web.css">
|
||||||
|
|
||||||
{{content-for "head-footer"}}
|
{{content-for "head-footer"}}
|
||||||
|
|
||||||
|
<script>
|
||||||
|
window.addEventListener('load', function() {
|
||||||
|
window.windowLoadComplete = true;
|
||||||
|
});
|
||||||
|
</script>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
{{content-for "body"}}
|
{{content-for "body"}}
|
||||||
|
|||||||
@@ -6,9 +6,14 @@
|
|||||||
export default {
|
export default {
|
||||||
name: 'defer-loading',
|
name: 'defer-loading',
|
||||||
initialize: function(application) {
|
initialize: function(application) {
|
||||||
|
// Load event already fired, so web3 should be loaded if available
|
||||||
|
if (window.windowLoadComplete) { return true; }
|
||||||
|
|
||||||
|
// Pause app loading
|
||||||
application.deferReadiness();
|
application.deferReadiness();
|
||||||
|
|
||||||
window.addEventListener('load', function() {
|
window.addEventListener('load', function() {
|
||||||
|
// Continue app loading
|
||||||
application.advanceReadiness();
|
application.advanceReadiness();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user