[WIP] improve loading of preferences

As suggested by Wolfgang in today's Community Call. (Note the "Uncaught TypeError" comment.)
eXist-db · Jul 19, 2021 · ced6868 · ced6868
1 parent 49cf8ce
commit ced6868
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/preferences.js b/src/preferences.js
@@ -36,7 +36,8 @@ eXide.util.Preferences = (function () {
         indentOnLoad: true,
         expandXIncludesOnLoad: false,
         softWrap: -1,
-        emmet: false
+        emmet: false,
+        version: "3.1.0" // eXide.app.version() returns "Uncaught TypeError: Cannot read property 'version' of undefined"
 	};
 
     Constr = function(editor) {
@@ -173,7 +174,7 @@ eXide.util.Preferences = (function () {
     Constr.prototype.read = function() {
         var sameVersion = false;
         if (localStorage["eXide.preferences"]) {
-            this.preferences = JSON.parse(localStorage.getItem("eXide.preferences"));
+            this.preferences = Object.assign(defaultPreferences, JSON.parse(localStorage.getItem("eXide.preferences")));
             sameVersion = (this.preferences.version === eXide.app.version());
         }