sync accounts

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

@@ -19,9 +19,9 @@ angular.module('app.frontend')
         /**
          * Insert 4 spaces when a tab key is pressed,
          * only used when inside of the text editor.
-	 * If the shift key is pressed first, this event is
-	 * not fired.
-         */
+      	 * If the shift key is pressed first, this event is
+      	 * not fired.
+               */
         var handleTab = function (event) {
           if (!event.shiftKey && event.which == 9) {
             event.preventDefault();
@@ -29,13 +29,13 @@ angular.module('app.frontend')
             var end = this.selectionEnd;
             var spaces = "    ";
 
-	    // Insert 4 spaces
+	           // Insert 4 spaces
             this.value = this.value.substring(0, start)
               + spaces + this.value.substring(end);
 
-	    // Place cursor 4 spaces away from where
-	    // the tab key was pressed
-	    this.selectionStart = this.selectionEnd = start + 4;
+      	    // Place cursor 4 spaces away from where
+      	    // the tab key was pressed
+      	    this.selectionStart = this.selectionEnd = start + 4;
           }
         }
 
@@ -88,7 +88,7 @@ angular.module('app.frontend')
       }
     }
   })
-  .controller('EditorCtrl', function ($sce, $timeout, apiController, markdownRenderer, $rootScope, extensionManager) {
+  .controller('EditorCtrl', function ($sce, $timeout, apiController, markdownRenderer, $rootScope, extensionManager, syncManager) {
 
     this.setNote = function(note, oldNote) {
       this.editorMode = 'edit';
@@ -148,12 +148,18 @@ angular.module('app.frontend')
         if(success) {
           if(statusTimeout) $timeout.cancel(statusTimeout);
           statusTimeout = $timeout(function(){
-            this.noteStatus = "All changes saved"
+            this.saveError = false;
+            var status = "All changes saved"
+            if(syncManager.offline) {
+              status += " (offline)";
+            }
+            this.noteStatus = status;
           }.bind(this), 200)
         } else {
           if(statusTimeout) $timeout.cancel(statusTimeout);
           statusTimeout = $timeout(function(){
-            this.noteStatus = "(Offline) — All changes saved"
+            this.saveError = true;
+            this.noteStatus = "Error saving"
           }.bind(this), 200)
         }
       }.bind(this));

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

@@ -12,6 +12,10 @@ angular.module('app.frontend')
       link:function(scope, elem, attrs, ctrl) {
         scope.$on("sync:updated_token", function(){
           ctrl.syncUpdated();
+          ctrl.findErrors();
+        })
+        scope.$on("sync:error", function(){
+          ctrl.findErrors();
         })
       }
     }
@@ -19,9 +23,16 @@ angular.module('app.frontend')
   .controller('HeaderCtrl', function (apiController, modelManager, $timeout, dbManager, syncManager) {
 
     this.user = apiController.user;
+    this.offline = syncManager.offline;
+
+    this.findErrors = function() {
+      this.error = syncManager.syncProviders.filter(function(provider){return provider.error}).length > 0 ? true : false;
+    }
+    this.findErrors();
+
 
     this.accountMenuPressed = function() {
-      this.serverData = {url: syncManager.serverURL()};
+      this.serverData = {};
       this.showAccountMenu = !this.showAccountMenu;
       this.showFaq = false;
       this.showNewPasswordForm = false;