From f7f0522f70c25382bd9991f68af63a50db4e2a2d Mon Sep 17 00:00:00 2001
From: Mo Bitar <me@bitar.io>
Date: Wed, 1 Mar 2017 17:44:20 -0600
Subject: [PATCH] fix on note delete, select first

---
 .../javascripts/app/frontend/controllers/editor.js     |  7 -------
 .../javascripts/app/frontend/controllers/home.js       | 10 ++++++++++
 .../javascripts/app/frontend/controllers/notes.js      |  1 -
 app/assets/javascripts/app/services/authManager.js     |  2 +-
 app/assets/templates/frontend/home.html.haml           |  2 +-
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/app/assets/javascripts/app/frontend/controllers/editor.js b/app/assets/javascripts/app/frontend/controllers/editor.js
index c9e8c9016..cdca7863e 100644
--- a/app/assets/javascripts/app/frontend/controllers/editor.js
+++ b/app/assets/javascripts/app/frontend/controllers/editor.js
@@ -224,16 +224,9 @@ angular.module('app.frontend')
       if(confirm("Are you sure you want to delete this note?")) {
         this.remove()(this.note);
         this.showMenu = false;
-        this.notifyDelete();
       }
     }
 
-    this.notifyDelete = function() {
-      $timeout(function() {
-        $rootScope.$broadcast("noteDeleted");
-      }.bind(this), 500);
-    }
-
     this.clickedEditNote = function() {
       this.editorMode = 'edit';
       this.focusEditor(100);
diff --git a/app/assets/javascripts/app/frontend/controllers/home.js b/app/assets/javascripts/app/frontend/controllers/home.js
index 550827f6b..df1f9307f 100644
--- a/app/assets/javascripts/app/frontend/controllers/home.js
+++ b/app/assets/javascripts/app/frontend/controllers/home.js
@@ -153,6 +153,12 @@ angular.module('app.frontend')
         this.$apply(fn);
     };
 
+    $scope.notifyDelete = function() {
+      $timeout(function() {
+        $rootScope.$broadcast("noteDeleted");
+      }.bind(this), 0);
+    }
+
     $scope.deleteNote = function(note) {
 
       modelManager.setItemToBeDeleted(note);
@@ -163,6 +169,7 @@ angular.module('app.frontend')
 
       if(note.dummy) {
         modelManager.removeItemLocally(note);
+        $scope.notifyDelete();
         return;
       }
 
@@ -170,8 +177,11 @@ angular.module('app.frontend')
         if(authManager.offline()) {
           // when deleting items while ofline, we need to explictly tell angular to refresh UI
           setTimeout(function () {
+            $scope.notifyDelete();
             $scope.safeApply();
           }, 50);
+        } else {
+          $scope.notifyDelete();
         }
       });
     }
diff --git a/app/assets/javascripts/app/frontend/controllers/notes.js b/app/assets/javascripts/app/frontend/controllers/notes.js
index 579d3e1d0..0d3106260 100644
--- a/app/assets/javascripts/app/frontend/controllers/notes.js
+++ b/app/assets/javascripts/app/frontend/controllers/notes.js
@@ -4,7 +4,6 @@ angular.module('app.frontend')
       scope: {
         addNew: "&",
         selectionMade: "&",
-        remove: "&",
         tag: "=",
         removeTag: "&"
       },
diff --git a/app/assets/javascripts/app/services/authManager.js b/app/assets/javascripts/app/services/authManager.js
index 5a9d1bde2..b0bb0a9b4 100644
--- a/app/assets/javascripts/app/services/authManager.js
+++ b/app/assets/javascripts/app/services/authManager.js
@@ -112,7 +112,7 @@ angular.module('app.frontend')
           }.bind(this))
           .catch(function(response){
             console.log("Registration error", response);
-            callback(null);
+            callback(response.data);
           })
         }.bind(this));
       }
diff --git a/app/assets/templates/frontend/home.html.haml b/app/assets/templates/frontend/home.html.haml
index 61203afcd..28584401b 100644
--- a/app/assets/templates/frontend/home.html.haml
+++ b/app/assets/templates/frontend/home.html.haml
@@ -4,7 +4,7 @@
                     "tags" => "tags"}
 
     %notes-section{"remove-tag" => "notesRemoveTag", "add-new" => "notesAddNew", "selection-made" => "notesSelectionMade",
-                      "tag" => "selectedTag", "remove" => "deleteNote"}
+                      "tag" => "selectedTag"}
 
     %editor-section{"note" => "selectedNote", "remove" => "deleteNote", "save" => "saveNote", "update-tags" => "updateTagsForNote"}