Fixing desktop and adding guide memory

gobstones · Sep 1, 2017 · 7b995f0 · 7b995f0
1 parent 2c677b6
commit 7b995f0
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 6 deletions.
diff --git a/app/elements/gobstones-ide/gobstones-ide.html b/app/elements/gobstones-ide/gobstones-ide.html
@@ -223,7 +223,10 @@
       },
 
       _renderMarkdown: function(markdown) {
-        if (!window.showdown) return "";
+        if (!window.showdown && window.GBS_DESKTOP) {
+          window.showdown = window.GBS_REQUIRE("showdown");
+        }
+
         return new window.showdown.Converter({tables: true}).makeHtml(markdown);
       },
 

diff --git a/app/elements/project-selector/project-selector.html b/app/elements/project-selector/project-selector.html
@@ -72,7 +72,7 @@ <h3 class="no-exercises">
         this._startLoading();
         this._guideLoader().all().then((guides) => {
           this.guides = guides;
-          this.selectedGuide = 0;
+          this.selectedGuide = localStorage.getItem("selected-guide") || 0;
         }).catch(() => this._stopLoading());
       },
 
@@ -105,6 +105,7 @@ <h3 class="no-exercises">
       },
 
       _onGuideChange: function() {
+        localStorage.setItem("selected-guide", this.selectedGuide);
         this._startLoading();
         this._loadCurrentGuide();
       },

diff --git a/app/scripts/loaders/remote/fsLoader.html b/app/scripts/loaders/remote/fsLoader.html
@@ -21,8 +21,17 @@
     }
 
     load(getContext, callback) {
-      const files = this._loadDir(this.path);
-      this.loader.readRaw(getContext(), this._createZip(files), callback);
+      const deferred = $.Deferred();
+
+      try {
+        const files = this._loadDir(this.path);
+        this.loader.readRaw(getContext(), this._createZip(files), callback);
+        deferred.resolve();
+      } catch(e) {
+        deferred.reject(e);
+      }
+
+      return deferred.promise();
     }
 
     _loadDir(path) {

diff --git a/app/start-electron.js b/app/start-electron.js
@@ -28,7 +28,7 @@ freeport((err, port) => {
       width: 1024,
       height: 800,
       webPreferences: {
-        nodeIntegration: false,
+        nodeIntegration: true,
         preload: __dirname + "/start-electron-preload.js",
         webSecurity: false
       }

diff --git a/package.json b/package.json
@@ -63,6 +63,7 @@
     "freeport": "^1.0.5",
     "recursive-readdir-sync": "^1.0.6",
     "serve-static": "^1.12.2",
-    "setimmediate": "^1.0.5"
+    "setimmediate": "^1.0.5",
+    "showdown": "^1.7.3"
   }
 }