Old 2.1 (abandoned, see packages branch instead)

Gruntfile.js

@@ -84,7 +84,8 @@ module.exports = function(grunt) {
          src: [
            'vendor/assets/bower_components/angular/angular.js',
            'vendor/assets/javascripts/lodash/lodash.custom.min.js',
-           'vendor/assets/javascripts/crypto/*.js'
+           'vendor/assets/javascripts/crypto/*.js',
+           'vendor/assets/javascripts/mousetrap/mousetrap.min.js',
          ],
          dest: 'vendor/assets/javascripts/lib.js',
        },

app/assets/javascripts/app/app.frontend.js

@@ -36,3 +36,7 @@ function parametersFromURL(url) {
 function isDesktopApplication() {
   return window && window.process && window.process.type && window.process.versions["electron"];
 }
+
+function isMacApplication() {
+  return window && window.process && window.process.type && window.process.platform == "darwin";
+}

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

@@ -37,7 +37,100 @@ angular.module('app.frontend')
       }
     }
   })
-  .controller('EditorCtrl', function ($sce, $timeout, authManager, $rootScope, extensionManager, syncManager, modelManager, editorManager, themeManager, componentManager, storageManager) {
+  .controller('EditorCtrl', function ($sce, $timeout, userManager, $rootScope, extensionManager, syncManager,
+    modelManager, editorManager, themeManager, componentManager, storageManager, keyboardManager) {
+
+    this.keyboardManager = keyboardManager;
+
+    keyboardManager.registerAction("delete-current-note", () => {
+      this.deleteNote();
+    })
+
+    keyboardManager.registerAction("toggle-note-archived", () => {
+      this.toggleArchiveNote();
+    })
+
+    keyboardManager.registerAction("toggle-note-pinned", () => {
+      this.togglePin();
+    })
+
+    keyboardManager.registerContextHandler("editor", (source, type) => {
+      if(type == 'begin') {
+        if(source == 'keyboard') {
+          // Focus note title
+          let titleInput = document.getElementById("note-title-editor");
+          if(titleInput) {
+            titleInput.focus();
+          }
+        }
+      }
+    })
+
+    this.resizeControl = {};
+
+    this.onPanelResizeFinish = function(width, left, isMaxWidth) {
+      if(isMaxWidth) {
+        userManager.userPreferences.setAppDataItem("editorWidth", null);
+      } else {
+        if(width !== undefined && width !== null) {
+          userManager.userPreferences.setAppDataItem("editorWidth", width);
+        }
+      }
+
+      if(left !== undefined && left !== null) {
+        userManager.userPreferences.setAppDataItem("editorLeft", left);
+      }
+      userManager.syncUserPreferences();
+    }
+
+    $rootScope.$on("user-preferences-changed", () => {
+      this.loadPreferences();
+    });
+
+    this.loadPreferences = function() {
+      this.monospaceFont = userManager.getUserPref("monospaceFont", "monospace");
+
+      if(!document.getElementById("editor-content")) {
+        // Elements have not yet loaded due to ng-if around wrapper
+        return;
+      }
+
+      this.reloadFont();
+
+      let width = userManager.getUserPref("editorWidth", null);
+      if(width !== null) {
+        this.resizeControl.setWidth(width);
+      }
+
+      let left = userManager.getUserPref("editorLeft", null);
+      if(left !== null) {
+        this.resizeControl.setLeft(left);
+      }
+    }
+
+    this.reloadFont = function() {
+      var editable = document.getElementById("note-text-editor");
+
+      if(!editable) {
+        return;
+      }
+      if(this.monospaceFont) {
+        if(isMacApplication()) {
+          editable.style.fontFamily = "Menlo, Consolas, 'DejaVu Sans Mono', monospace";
+        } else {
+          editable.style.fontFamily = "monospace";
+        }
+      } else {
+        editable.style.fontFamily = "inherit";
+      }
+    }
+
+    this.toggleKey = function(key) {
+      this[key] = !this[key];
+      userManager.userPreferences.setAppDataItem(key, this[key]);
+      userManager.syncUserPreferences();
+      this.reloadFont();
+    }
 
     this.componentManager = componentManager;
     this.componentStack = [];
@@ -165,10 +258,17 @@ angular.module('app.frontend')
       this.showMenu = false;
       this.loadTagsString();
 
+      let onReady = () => {
+        this.noteReady = true;
+        $timeout(() => {
+          this.loadPreferences();
+        })
+      }
+
       var setEditor = function(editor) {
         this.editor = editor;
         this.postNoteToExternalEditor();
-        this.noteReady = true;
+        onReady();
       }.bind(this)
 
       var editor = this.editorForNote(note);
@@ -188,11 +288,10 @@ angular.module('app.frontend')
           setEditor(editor);
         }
       } else {
-        this.editor = null;
-        this.noteReady = true;
+        this.editor = editorManager.systemEditor;
+        onReady();
       }
 
-
       if(note.safeText().length == 0 && note.dummy) {
         this.focusTitle(100);
       }
@@ -209,7 +308,7 @@ angular.module('app.frontend')
     this.selectedEditor = function(editor) {
       this.showEditorMenu = false;
 
-      if(this.editor && editor !== this.editor) {
+      if(this.editor && editor !== this.editor && !this.editor.systemEditor) {
         this.editor.removeItemAsRelationship(this.note);
         this.editor.setDirty(true);
       }
@@ -220,6 +319,12 @@ angular.module('app.frontend')
       syncManager.sync();
 
       this.editor = editor;
+
+      if(editor.systemEditor) {
+        $timeout(() => {
+          this.reloadFont();
+        })
+      }
     }.bind(this)
 
     this.editorForNote = function(note) {
@@ -250,7 +355,7 @@ angular.module('app.frontend')
     }
 
     this.postNoteToExternalEditor = function() {
-      if(!this.editor) {
+      if(!this.editor || this.editor.systemEditor) {
         return;
       }
 
@@ -296,7 +401,7 @@ angular.module('app.frontend')
           if(statusTimeout) $timeout.cancel(statusTimeout);
           statusTimeout = $timeout(function(){
             var status = "All changes saved";
-            if(authManager.offline()) {
+            if(userManager.offline()) {
               status += " (offline)";
             }
             this.saveError = false;
@@ -344,29 +449,41 @@ angular.module('app.frontend')
 
     this.onNameFocus = function() {
       this.editingName = true;
+      keyboardManager.lockKeyboardContext();
     }
 
-    this.onContentFocus = function() {
-      $rootScope.$broadcast("editorFocused");
+    this.onNameBlur = function() {
+      this.editingName = false;
+      keyboardManager.unlockKeyboardContext();
     }
 
-    this.onNameBlur = function() {
+    this.onTagsFocus = function() {
+      this.editingName = true;
+      keyboardManager.lockKeyboardContext();
+    }
+
+    this.onTagsBlur = function() {
       this.editingName = false;
+      keyboardManager.unlockKeyboardContext();
+      this.updateTagsFromTagsString()
     }
 
-    this.toggleFullScreen = function() {
-      this.fullscreen = !this.fullscreen;
-      if(this.fullscreen) {
-        this.focusEditor(0);
-      }
+    this.onContentFocus = function() {
+      $rootScope.$broadcast("editorFocused");
+      keyboardManager.lockKeyboardContext();
+    }
+
+    this.onContentBlur = function() {
+      keyboardManager.unlockKeyboardContext();
     }
 
     this.selectedMenuItem = function($event) {
       this.showMenu = false;
     }
 
     this.deleteNote = function() {
-      if(confirm("Are you sure you want to delete this note?")) {
+      let title = this.note.safeTitle().length ? `'${this.note.title}'` : "this note";
+      if(confirm(`Are you sure you want to delete ${title}?`)) {
         this.remove()(this.note);
         this.showMenu = false;
       }
@@ -430,9 +547,7 @@ angular.module('app.frontend')
       this.loadTagsString();
     }
 
-    this.updateTagsFromTagsString = function($event) {
-      $event.target.blur();
-
+    this.updateTagsFromTagsString = function() {
       var tags = this.tagsString.split("#");
       tags = _.filter(tags, function(tag){
         return tag.length > 0;

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

@@ -1,5 +1,5 @@
 angular.module('app.frontend')
-  .directive("footer", function(authManager){
+  .directive("footer", function(userManager){
     return {
       restrict: 'E',
       scope: {},
@@ -22,12 +22,12 @@ angular.module('app.frontend')
       }
     }
   })
-  .controller('FooterCtrl', function ($rootScope, authManager, modelManager, $timeout, dbManager, syncManager, storageManager, passcodeManager) {
+  .controller('FooterCtrl', function ($rootScope, userManager, modelManager, $timeout, dbManager, syncManager, storageManager, passcodeManager) {
 
-    this.user = authManager.user;
+    this.user = userManager.user;
 
     this.updateOfflineStatus = function() {
-      this.offline = authManager.offline();
+      this.offline = userManager.offline();
     }
     this.updateOfflineStatus();
 

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

@@ -1,8 +1,12 @@
 angular.module('app.frontend')
 .controller('HomeCtrl', function ($scope, $location, $rootScope, $timeout, modelManager,
-  dbManager, syncManager, authManager, themeManager, passcodeManager, storageManager) {
+  dbManager, syncManager, userManager, themeManager, passcodeManager, storageManager) {
 
-    storageManager.initialize(passcodeManager.hasPasscode(), authManager.isEphemeralSession());
+    storageManager.initialize(passcodeManager.hasPasscode(), userManager.isEphemeralSession());
+
+    $rootScope.sync = function() {
+      syncManager.sync();
+    }
 
     $scope.onUpdateAvailable = function(version) {
       $rootScope.$broadcast('new-update-available', version);
@@ -49,13 +53,12 @@ angular.module('app.frontend')
     }
 
     function initiateSync() {
-      authManager.loadInitialData();
+      userManager.loadInitialData();
       syncManager.loadLocalItems(function(items) {
         $scope.allTag.didLoad = true;
         themeManager.activateInitialTheme();
         $scope.$apply();
 
-
         syncManager.sync(null);
         // refresh every 30s
         setInterval(function () {
@@ -226,7 +229,7 @@ angular.module('app.frontend')
       }
 
       syncManager.sync(function(){
-        if(authManager.offline()) {
+        if(userManager.offline()) {
           // when deleting items while ofline, we need to explictly tell angular to refresh UI
           setTimeout(function () {
             $scope.notifyDelete();
@@ -251,9 +254,9 @@ angular.module('app.frontend')
       var email = urlParam("email");
       var pw = urlParam("pw");
 
-      if(!authManager.offline()) {
+      if(!userManager.offline()) {
         // check if current account
-        if(syncManager.serverURL === server && authManager.user.email === email) {
+        if(syncManager.serverURL === server && userManager.user.email === email) {
           // already signed in, return
           return;
         } else {
@@ -263,7 +266,7 @@ angular.module('app.frontend')
           })
         }
       } else {
-        authManager.login(server, email, pw, false, function(response){
+        userManager.login(server, email, pw, false, function(response){
           window.location.reload();
         })
       }