Avoid race condition at loading. Fixes #265.

Using the simple solution...
ivmartel · Dec 18, 2016 · ab4e17e · ab4e17e
1 parent 1f25ace
commit ab4e17e
Show file tree

Hide file tree

Showing 4 changed files with 76 additions and 20 deletions.
diff --git a/viewers/mobile/applauncher.js b/viewers/mobile/applauncher.js
@@ -62,9 +62,23 @@ dwv.image.decoderScripts = {
 dwv.browser.check();
 // initialise i18n
 dwv.i18nInitialise();
-// launch when page is ready
-$(document).ready( function()
-{
-    // and i18n is loaded
-    dwv.i18nOnLoaded( startApp );
+
+// status flags
+var domContentLoaded = false;
+var i18nLoaded = false;
+// launch when both DOM and i18n are ready
+function launchApp() {
+    if ( domContentLoaded && i18nLoaded ) {
+        startApp();
+    }
+}
+// DOM ready?
+$(document).ready( function() {
+    domContentLoaded = true;
+    launchApp();
+});
+// i18n ready?
+dwv.i18nOnLoaded( function () {
+    i18nLoaded = true;
+    launchApp();
 });
diff --git a/viewers/simple/applauncher.js b/viewers/simple/applauncher.js
@@ -28,9 +28,23 @@ dwv.image.decoderScripts = {
 dwv.browser.check();
 // initialise i18n
 dwv.i18nInitialise();
-// launch when page is loaded
-$(document).ready( function()
-{
-    // and i18n is loaded
-    dwv.i18nOnLoaded( startApp );
+
+// status flags
+var domContentLoaded = false;
+var i18nLoaded = false;
+// launch when both DOM and i18n are ready
+function launchApp() {
+    if ( domContentLoaded && i18nLoaded ) {
+        startApp();
+    }
+}
+// DOM ready?
+$(document).ready( function() {
+    domContentLoaded = true;
+    launchApp();
+});
+// i18n ready?
+dwv.i18nOnLoaded( function () {
+    i18nLoaded = true;
+    launchApp();
 });
diff --git a/viewers/simplistic/applauncher.js b/viewers/simplistic/applauncher.js
@@ -28,9 +28,23 @@ dwv.image.decoderScripts = {
 dwv.browser.check();
 // initialise i18n
 dwv.i18nInitialise();
-// launch when page is loaded
-document.addEventListener("DOMContentLoaded", function (/*event*/)
-{
-    // and i18n is loaded
-    dwv.i18nOnLoaded( startApp );
+
+// status flags
+var domContentLoaded = false;
+var i18nLoaded = false;
+// launch when both DOM and i18n are ready
+function launchApp() {
+    if ( domContentLoaded && i18nLoaded ) {
+        startApp();
+    }
+}
+// DOM ready?
+document.addEventListener("DOMContentLoaded", function (/*event*/) {
+    domContentLoaded = true;
+    launchApp();
+});
+// i18n ready?
+dwv.i18nOnLoaded( function () {
+    i18nLoaded = true;
+    launchApp();
 });
diff --git a/viewers/static/applauncher.js b/viewers/static/applauncher.js
@@ -37,9 +37,23 @@ dwv.image.decoderScripts = {
 dwv.browser.check();
 // initialise i18n
 dwv.i18nInitialise();
-// launch when page is loaded
-$(document).ready( function()
-{
-    // and i18n is loaded
-    dwv.i18nOnLoaded( startApp );
+
+// status flags
+var domContentLoaded = false;
+var i18nLoaded = false;
+// launch when both DOM and i18n are ready
+function launchApp() {
+    if ( domContentLoaded && i18nLoaded ) {
+        startApp();
+    }
+}
+// DOM ready?
+$(document).ready( function() {
+    domContentLoaded = true;
+    launchApp();
+});
+// i18n ready?
+dwv.i18nOnLoaded( function () {
+    i18nLoaded = true;
+    launchApp();
 });