Load script/imachine asynchronously during 4ls

2 files changed, 8 insertions, 11 deletions

diff --git a/www/js/html5ks.js b/www/js/html5ks.js
index 74ab43b..502ca75 100644
--- a/www/js/html5ks.js
+++ b/www/js/html5ks.js
@@ -218,10 +218,9 @@ window.html5ks = {
     }
   },
   start: function () {
-    this.fetch("json", "script").then(function () {
-      html5ks.api.movie_cutscene("4ls", true).then(function () {
-        html5ks.menu.mainMenu();
-      });
+    this.fetch("json", "script");
+    html5ks.api.movie_cutscene("4ls", true).then(function () {
+      html5ks.menu.mainMenu();
     });
   },
   fetch: function (type, name) {
diff --git a/www/js/menu.js b/www/js/menu.js
index 1b826b3..77ae7ee 100644
--- a/www/js/menu.js
+++ b/www/js/menu.js
@@ -184,16 +184,14 @@
       this.initEvents();
       this.initOptions();
 
-      this.elements.main.start.addEventListener("click", function () {
-        if (this._imachine_loaded) {
+      when.all([html5ks.fetch("json", "imachine"),
+          html5ks.fetch("json", "script")]).then(function () {
+        var start = this.elements.main.start;
+        start.addEventListener("click", function () {
           this.elements.mainMenu.style.display = "none";
           html5ks.imachine.start().then(this.mainMenu.bind(this));
-        }
-      }.bind(this), false);
-      html5ks.fetch("json", "imachine").then(function () {
-        var start = this.elements.main.start;
+        }.bind(this), false);
         start.className = start.className.replace("disabled", "");
-        this._imachine_loaded = true;
       }.bind(this));
     },