1.0.89

andrewbrg · andrewbrg · commit 8c7351e2e3f1 · 2017-12-23T14:47:46.000+01:00
diff --git a/src/js/handlers/editors.js b/src/js/handlers/editors.js
@@ -48,6 +48,8 @@ var EditorsHandler = function () {
 
         $.get('/src/settings/ace.defaults.json', function (data) {
 
+            data = that.isJsonString(data) ? JSON.parse(data) : data;
+
             that.defaultTheme    = data.theme;
             that.defaultFont     = data.fontFamily;
             that.defaultFontSize = data.fontSize;
@@ -385,6 +387,7 @@ var EditorsHandler = function () {
         idx          = parseInt(idx);
 
         this.getAllEditorModes().then(function (data) {
+            data    = that.isJsonString(data) ? JSON.parse(data) : data;
             var ext = that._getTabFileExtension(idx);
             if (typeof ext === typeof undefined) {
                 deferred.resolve(JSON.stringify({
@@ -409,6 +412,7 @@ var EditorsHandler = function () {
         var that = this;
 
         this.getAllEditorModes().done(function (data) {
+            data = that.isJsonString(data) ? JSON.parse(data) : data;
             that.getAddTabDropDownContainer().html('');
             $.each(data, function (i, v) {
                 that.getAddTabDropDownContainer().append(
@@ -569,6 +573,15 @@ var EditorsHandler = function () {
         );
     };
 
+    this.isJsonString = function (str) {
+        try {
+            JSON.parse(str);
+        } catch (e) {
+            return false;
+        }
+        return true;
+    };
+
     this.startup = function () {
 
         var that = this;
diff --git a/src/js/handlers/ide.settings.js b/src/js/handlers/ide.settings.js
@@ -201,7 +201,8 @@ var IdeSettingsHandler = function () {
 
             if (key === 'theme') {
                 $.get('/src/settings/ace.themes.json', function (data) {
-                    $.each(JSON.parse(data), function (i1, v1) {
+                    data = that.Editors.isJsonString(data) ? JSON.parse(data) : data;
+                    $.each(data, function (i1, v1) {
                         themeOps += '<optgroup label="' + i1 + '">';
                         $.each(v1, function (i2, v2) {
                             themeOps += '<option value="' + i2 + '">' + v2 + '</option>';
@@ -214,7 +215,8 @@ var IdeSettingsHandler = function () {
             }
             else if (key === 'fontSize') {
                 $.get('/src/settings/ace.font.sizes.json', function (data) {
-                    $.each(JSON.parse(data), function (i1, v1) {
+                    data = that.Editors.isJsonString(data) ? JSON.parse(data) : data;
+                    $.each(data, function (i1, v1) {
                         fontSizeOpts += '<option value="' + i1 + '">' + v1 + '</option>';
                     });
                     $el.html(fontSizeOpts);
@@ -223,7 +225,8 @@ var IdeSettingsHandler = function () {
             }
             else if (key === 'fontFamily') {
                 $.get('/src/settings/ace.fonts.json', function (data) {
-                    $.each(JSON.parse(data), function (i1, v1) {
+                    data = that.Editors.isJsonString(data) ? JSON.parse(data) : data;
+                    $.each(data, function (i1, v1) {
                         fontOpts += '<optgroup label="' + i1 + '">';
                         $.each(v1, function (i2, v2) {
                             fontOpts += '<option value="' + i2 + '">' + v2 + '</option>';
diff --git a/src/js/handlers/sidebar.js b/src/js/handlers/sidebar.js
@@ -4,7 +4,6 @@ var SidebarHandler = function () {
     this.Editors       = undefined;
     this.Files         = undefined;
 
-    this.bootstrapMenu = null;
     this.dirEntry      = null;
     this.isInitialised = false;
 
@@ -51,7 +50,7 @@ var SidebarHandler = function () {
             });
         };
 
-        this.bootstrapMenu = new BootstrapMenu('.node-sidebar', {
+        new BootstrapMenu('.node-sidebar', {
             fetchElementData: function ($el) {
                 return $el
             },
@@ -248,7 +247,7 @@ var SidebarHandler = function () {
             };
 
             that.Editors.getAllEditorModes().then(function (data) {
-                modes = data;
+                modes = that.Editors.isJsonString(data) ? JSON.parse(data) : data;
                 buildTreeViewJson(dirEntry, function (treeViewJson) {
                     that._initTreeView(treeViewJson, dirEntry.name);
                     that.Editors.clearAllOpenTabs();
