Simplified and opmtimized async / Promises.

Author: MarkusBordihn

package-lock.json

@@ -30,7 +30,7 @@
     "make-dir": "^1.3.0",
     "markdownlint": "^0.8.1",
     "markdownlint-cli": "^0.8.1",
-    "nw": "^0.31.4",
+    "nw": "^0.31.5",
     "nw-builder": "^3.5.4",
     "replace-in-file": "^3.4.0",
     "rimraf": "^2.6.2"

package.json

@@ -82,19 +82,16 @@ cwc.Cache.prototype.update = async function(version) {
   this.log_.info('Updating Cache to version', this.version);
   await this.database_.clear();
 
-  let promises = [];
   this.log_.info('Loading external frameworks ...');
-  promises.push(this.loadFiles(cwc.framework.External));
+  await this.loadFiles(cwc.framework.External);
 
   this.log_.info('Loading internal frameworks ...');
-  promises.push(this.loadFiles(cwc.framework.Internal));
+  await this.loadFiles(cwc.framework.Internal);
 
   this.log_.info('Loading Style Sheets ...');
-  promises.push(this.loadFiles(cwc.framework.StyleSheet));
-
-  promises.push(this.database_.add('__version__', this.version));
+  await this.loadFiles(cwc.framework.StyleSheet);
 
-  await Promise.all(promises);
+  await this.database_.add('__version__', this.version);
 };
 
 

src/cache/cache.js

@@ -282,7 +282,7 @@ cwc.ui.Builder.prototype.decorateUI = function() {
       this.setProgressFunc('Prepare account support ...', this.prepareAccount);
     }
     this.setProgressFunc('Loading select screen ...', this.showSelectScreen);
-    let startCwC = () => {
+    this.setProgressFunc('Loading cache ...', this.loadCache).then(() => {
       // Done.
       this.setProgress('Starting Coding with Chrome', 100);
       this.loaded = true;
@@ -292,12 +292,8 @@ cwc.ui.Builder.prototype.decorateUI = function() {
       this.events_.clear();
       this.loadingScreen_.hideSecondsAfterStart(3000);
       resolve();
-    };
-    this.setProgressFunc('Loading cache ...', this.loadCache).then(() => {
-      startCwC();
     }).catch((error) => {
       this.log_.error('Failed to load cache', error);
-      startCwC();
     });
   });
 };