default editors

app/assets/javascripts/app/frontend/controllers/editor.js

@@ -23,7 +23,7 @@ angular.module('app.frontend')
       }
     }
   })
-  .controller('EditorCtrl', function ($sce, $timeout, authManager, $rootScope, extensionManager, syncManager, modelManager) {
+  .controller('EditorCtrl', function ($sce, $timeout, authManager, $rootScope, extensionManager, syncManager, modelManager, editorManager) {
 
     window.addEventListener("message", function(event){
       if(event.data.status) {
@@ -36,9 +36,9 @@ angular.module('app.frontend')
         if(this.note.uuid === id) {
           this.note.text = text;
           if(data) {
-            var changesMade = this.customEditor.setData(id, data);
+            var changesMade = this.editor.setData(id, data);
             if(changesMade) {
-              this.customEditor.setDirty(true);
+              this.editor.setDirty(true);
             }
           }
           this.changesMade();
@@ -52,14 +52,14 @@ angular.module('app.frontend')
 
     this.setNote = function(note, oldNote) {
       this.noteReady = false;
-      var currentEditor = this.customEditor;
-      this.customEditor = null;
+      var currentEditor = this.editor;
+      this.editor = null;
       this.showExtensions = false;
       this.showMenu = false;
       this.loadTagsString();
 
       var setEditor = function(editor) {
-        this.customEditor = editor;
+        this.editor = editor;
         this.postNoteToExternalEditor();
         this.noteReady = true;
       }.bind(this)
@@ -76,10 +76,11 @@ angular.module('app.frontend')
           setEditor(editor);
         }
       } else {
-        this.customEditor = null;
+        this.editor = null;
         this.noteReady = true;
       }
 
+
       if(note.safeText().length == 0 && note.dummy) {
         this.focusTitle(100);
       }
@@ -96,18 +97,15 @@ angular.module('app.frontend')
     this.selectedEditor = function(editor) {
       this.showEditorMenu = false;
 
-      if(this.customEditor && editor !== this.customEditor) {
-        this.customEditor.removeItemAsRelationship(this.note);
-        this.customEditor.setDirty(true);
+      if(this.editor && editor !== this.editor) {
+        this.editor.removeItemAsRelationship(this.note);
+        this.editor.setDirty(true);
       }
 
-      if(editor.default) {
-        this.customEditor = null;
-      } else {
-        this.customEditor = editor;
-        this.customEditor.addItemAsRelationship(this.note);
-        this.customEditor.setDirty(true);
-      }
+      editor.addItemAsRelationship(this.note);
+      editor.setDirty(true);
+
+      this.editor = editor;
     }.bind(this)
 
     this.editorForNote = function(note) {
@@ -117,13 +115,13 @@ angular.module('app.frontend')
           return editor;
         }
       }
-      return null;
+      return _.find(editors, {default: true});
     }
 
     this.postNoteToExternalEditor = function() {
       var externalEditorElement = document.getElementById("editor-iframe");
       if(externalEditorElement) {
-        externalEditorElement.contentWindow.postMessage({text: this.note.text, data: this.customEditor.dataForKey(this.note.uuid), id: this.note.uuid}, '*');
+        externalEditorElement.contentWindow.postMessage({text: this.note.text, data: this.editor.dataForKey(this.note.uuid), id: this.note.uuid}, '*');
       }
     }
 

app/assets/javascripts/app/frontend/models/app/editor.js

@@ -15,13 +15,17 @@ class Editor extends Item {
     this.url = contentObject.url;
     this.name = contentObject.name;
     this.data = contentObject.data || {};
+    this.default = contentObject.default;
+    this.systemEditor = contentObject.systemEditor;
   }
 
   structureParams() {
     var params = {
       url: this.url,
       name: this.name,
-      data: this.data
+      data: this.data,
+      default: this.default,
+      systemEditor: this.systemEditor
     };
 
     _.merge(params, super.structureParams());

app/assets/javascripts/app/services/directives/views/editorMenu.js

@@ -9,24 +9,11 @@ class EditorMenu {
     };
   }
 
-  controller($scope, modelManager, extensionManager, syncManager) {
+  controller($scope, modelManager, editorManager, syncManager) {
     'ngInject';
 
     $scope.formData = {};
-
-    let editorContentType = "SN|Editor";
-
-    let defaultEditor = {
-      default: true,
-      name: "Plain"
-    }
-
-    $scope.sysEditors = [defaultEditor];
-    $scope.editors = modelManager.itemsForContentType(editorContentType);
-
-    $scope.editorForUrl = function(url) {
-      return $scope.editors.filter(function(editor){return editor.url == url})[0];
-    }
+    $scope.editorManager = editorManager;
 
     $scope.selectEditor = function(editor) {
       $scope.callback()(editor);
@@ -34,38 +21,23 @@ class EditorMenu {
 
     $scope.deleteEditor = function(editor) {
       if(confirm("Are you sure you want to delete this editor?")) {
-        modelManager.setItemToBeDeleted(editor);
-        syncManager.sync();
-        _.pull($scope.editors, editor);
+        editorManager.deleteEditor(editor);
       }
     }
 
+    $scope.setDefaultEditor = function(editor) {
+      editorManager.setDefaultEditor(editor);
+    }
+
+    $scope.removeDefaultEditor = function(editor) {
+      editorManager.removeDefaultEditor(editor);
+    }
+
     $scope.submitNewEditorRequest = function() {
-      var editor = createEditor($scope.formData.url);
-      modelManager.addItem(editor);
-      editor.setDirty(true);
-      syncManager.sync();
-      $scope.editors.push(editor);
+      editorManager.addNewEditorFromURL($scope.formData.url);
       $scope.formData = {};
     }
 
-    function createEditor(url) {
-      var name = getParameterByName("name", url);
-      return modelManager.createItem({
-        content_type: editorContentType,
-        url: url,
-        name: name
-      })
-    }
-
-    function getParameterByName(name, url) {
-      name = name.replace(/[\[\]]/g, "\\$&");
-      var regex = new RegExp("[?&]" + name + "(=([^&#]*)|&|#|$)"),
-          results = regex.exec(url);
-      if (!results) return null;
-      if (!results[2]) return '';
-      return decodeURIComponent(results[2].replace(/\+/g, " "));
-    }
   }
 
 }

app/assets/javascripts/app/services/editorManager.js

@@ -0,0 +1,107 @@
+class EditorManager {
+
+
+  constructor($rootScope, modelManager, syncManager) {
+      this.syncManager = syncManager;
+      this.modelManager = modelManager;
+
+      this.editorType = "SN|Editor";
+      this._systemEditor = {
+        systemEditor: true,
+        name: "Plain"
+      }
+
+      $rootScope.$on("sync:completed", function(){
+        if(this.systemEditor.uuid) {
+          return;
+        }
+
+        var liveSysEditor = _.find(this.allEditors, {systemEditor: true});
+        if(liveSysEditor) {
+          this._systemEditor = liveSysEditor;
+        } else {
+          this._systemEditor = modelManager.createItem({
+            content_type: this.editorType,
+            systemEditor: true,
+            name: "Plain"
+          })
+          modelManager.addItem(this._systemEditor);
+          this._systemEditor.setDirty(true);
+          syncManager.sync();
+        }
+      }.bind(this))
+  }
+
+  get allEditors() {
+    return this.modelManager.itemsForContentType(this.editorType);
+  }
+
+  get externalEditors() {
+    return this.allEditors.filter(function(editor){
+      return !editor.systemEditor;
+    })
+  }
+
+  get systemEditors() {
+    return [this.systemEditor];
+  }
+
+  get systemEditor() {
+    return this._systemEditor;
+  }
+
+  get defaultEditor() {
+    return _.find(this.externalEditors, {default: true});
+  }
+
+  editorForUrl(url) {
+    return this.externalEditors.filter(function(editor){return editor.url == url})[0];
+  }
+
+  setDefaultEditor(editor) {
+    var defaultEditor = this.defaultEditor;
+    if(defaultEditor) {
+      defaultEditor.default = false;
+      defaultEditor.setDirty(true);
+    }
+    editor.default = true;
+    editor.setDirty(true);
+    this.syncManager.sync();
+  }
+
+  removeDefaultEditor(editor) {
+    editor.default = false;
+    editor.setDirty(true);
+    this.syncManager.sync();
+  }
+
+  addNewEditorFromURL(url) {
+    var name = getParameterByName("name", url);
+    var editor = modelManager.createItem({
+      content_type: this.editorType,
+      url: url,
+      name: name
+    })
+
+    this.modelManager.addItem(editor);
+    editor.setDirty(true);
+    this.syncManager.sync();
+  }
+
+  deleteEditor(editor) {
+    this.modelManager.setItemToBeDeleted(editor);
+    this.syncManager.sync();
+  }
+
+  getParameterByName(name, url) {
+    name = name.replace(/[\[\]]/g, "\\$&");
+    var regex = new RegExp("[?&]" + name + "(=([^&#]*)|&|#|$)"),
+        results = regex.exec(url);
+    if (!results) return null;
+    if (!results[2]) return '';
+    return decodeURIComponent(results[2].replace(/\+/g, " "));
+  }
+
+}
+
+angular.module('app.frontend').service('editorManager', EditorManager);

app/assets/javascripts/app/services/syncManager.js

@@ -208,6 +208,7 @@ class SyncManager {
         }.bind(this), 10); // wait 10ms to allow UI to update
       } else {
         this.callQueuedCallbacksAndCurrent(callback, response);
+        this.$rootScope.$broadcast("sync:completed");
       }
     }.bind(this);