From 3029a97c0e96fbcb099dee0c1d9d7b32d42bb820 Mon Sep 17 00:00:00 2001
From: Mo Bitar <me@bitar.io>
Date: Thu, 26 Jan 2017 19:59:55 -0600
Subject: [PATCH] editor error message

---
 .../app/frontend/controllers/editor.js        |  2 +-
 .../app/services/sync/syncRunner.js           |  2 +-
 app/assets/stylesheets/app/_header.scss       | 94 ++++++++++---------
 .../templates/frontend/editor.html.haml       |  2 +-
 4 files changed, 52 insertions(+), 48 deletions(-)

diff --git a/app/assets/javascripts/app/frontend/controllers/editor.js b/app/assets/javascripts/app/frontend/controllers/editor.js
index d0e1ae539..3ed103bca 100644
--- a/app/assets/javascripts/app/frontend/controllers/editor.js
+++ b/app/assets/javascripts/app/frontend/controllers/editor.js
@@ -148,11 +148,11 @@ angular.module('app.frontend')
         if(success) {
           if(statusTimeout) $timeout.cancel(statusTimeout);
           statusTimeout = $timeout(function(){
-            this.saveError = false;
             var status = "All changes saved"
             if(syncManager.offline) {
               status += " (offline)";
             }
+            this.saveError = false;
             this.noteStatus = status;
           }.bind(this), 200)
         } else {
diff --git a/app/assets/javascripts/app/services/sync/syncRunner.js b/app/assets/javascripts/app/services/sync/syncRunner.js
index f79b7c694..9c1734409 100644
--- a/app/assets/javascripts/app/services/sync/syncRunner.js
+++ b/app/assets/javascripts/app/services/sync/syncRunner.js
@@ -171,7 +171,7 @@ class SyncRunner {
     }.bind(this))
     .catch(function(response){
       console.log("Sync error: ", response);
-      var error = response.data.error || {message: "Could not connect to server."};
+      var error = response.data ? response.data.error : {message: "Could not connect to server."};
 
       // Re-add subItems since this operation failed. We'll have to try again.
       provider.addPendingItems(subItems);
diff --git a/app/assets/stylesheets/app/_header.scss b/app/assets/stylesheets/app/_header.scss
index 00729ed13..fdd951bc2 100644
--- a/app/assets/stylesheets/app/_header.scss
+++ b/app/assets/stylesheets/app/_header.scss
@@ -1,27 +1,71 @@
 .pull-left {
-  float: left;
+  float: left !important;
 }
 
 .pull-right {
-  float: right;
+  float: right !important;
 }
 
 .mt-5 {
-  margin-top: 5px;
+  margin-top: 5px !important;
 }
 
 .mt-10 {
-  margin-top: 10px;
+  margin-top: 10px !important;
 }
 
 .mt-15 {
-  margin-top: 15px;
+  margin-top: 15px !important;
 }
 
 .faded {
   opacity: 0.5;
 }
 
+.center-align {
+  text-align: center !important;
+}
+
+.center {
+  margin-left: auto !important;
+  margin-right: auto !important;
+}
+
+.block {
+  display: block !important;
+}
+
+.wrap {
+  word-wrap: break-word;
+}
+
+.one-line-overflow {
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
+}
+
+.small-v-space {
+  height: 6px;
+  display: block;
+}
+
+.medium-padding {
+  padding: 10px !important;
+}
+
+.large-padding {
+  padding: 15px !important;
+}
+
+.red {
+  color: red !important;
+}
+
+.bold {
+  font-weight: bold !important;
+}
+
 .footer-bar {
   position: relative;
   width: 100%;
@@ -93,46 +137,6 @@
     margin-bottom: 10px;
     border-radius: 0px;
   }
-
-  .center-align {
-    text-align: center;
-  }
-
-  .center {
-    margin-left: auto;
-    margin-right: auto;
-  }
-
-  .block {
-    display: block;
-  }
-
-  .wrap {
-    word-wrap: break-word;
-  }
-
-  .one-line-overflow {
-    white-space: nowrap;
-    text-overflow: ellipsis;
-    overflow: hidden;
-  }
-
-  .small-v-space {
-    height: 6px;
-    display: block;
-  }
-
-  .medium-padding {
-    padding: 10px;
-  }
-
-  .large-padding {
-    padding: 15px;
-  }
-
-  .red {
-    color: red;
-  }
 }
 
 .footer-bar-link {
diff --git a/app/assets/templates/frontend/editor.html.haml b/app/assets/templates/frontend/editor.html.haml
index 322b42d7f..50461f012 100644
--- a/app/assets/templates/frontend/editor.html.haml
+++ b/app/assets/templates/frontend/editor.html.haml
@@ -5,7 +5,7 @@
         %input.input#note-title-editor{"ng-model" => "ctrl.note.title", "ng-keyup" => "$event.keyCode == 13 && ctrl.saveTitle($event)",
                   "ng-change" => "ctrl.nameChanged()", "ng-focus" => "ctrl.onNameFocus()",
                   "select-on-click" => "true"}
-      .save-status {{ctrl.noteStatus}}
+      .save-status{"ng-class" => "{'red bold': ctrl.saveError}"} {{ctrl.noteStatus}}
       .tags
         %input.tags-input{"type" => "text", "ng-keyup" => "$event.keyCode == 13 && ctrl.updateTagsFromTagsString($event, ctrl.tagsString)",
         "ng-model" => "ctrl.tagsString", "placeholder" => "#tags", "ng-blur" => "ctrl.updateTagsFromTagsString($event, ctrl.tagsString)"}