From 883d6525a8d16bc16c3ae04c33eca9097a00b257 Mon Sep 17 00:00:00 2001
From: Mo Bitar <me@bitar.io>
Date: Sat, 4 Nov 2017 19:52:13 -0500
Subject: [PATCH] Rename removeAllRelationships ->
 removeAndDirtyAllRelationships to be more explicit

---
 app/assets/javascripts/app/frontend/models/api/item.js |  2 +-
 .../javascripts/app/frontend/models/app/editor.js      |  4 ++--
 app/assets/javascripts/app/frontend/models/app/note.js |  2 +-
 app/assets/javascripts/app/frontend/models/app/tag.js  |  2 +-
 app/assets/javascripts/app/services/modelManager.js    | 10 +---------
 5 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/app/assets/javascripts/app/frontend/models/api/item.js b/app/assets/javascripts/app/frontend/models/api/item.js
index fffb5c22b..af65d5aa3 100644
--- a/app/assets/javascripts/app/frontend/models/api/item.js
+++ b/app/assets/javascripts/app/frontend/models/api/item.js
@@ -117,7 +117,7 @@ class Item {
 
   }
 
-  removeAllRelationships() {
+  removeAndDirtyAllRelationships() {
     // must override
     this.setDirty(true);
   }
diff --git a/app/assets/javascripts/app/frontend/models/app/editor.js b/app/assets/javascripts/app/frontend/models/app/editor.js
index 551d2d9f8..3a38f0734 100644
--- a/app/assets/javascripts/app/frontend/models/app/editor.js
+++ b/app/assets/javascripts/app/frontend/models/app/editor.js
@@ -56,8 +56,8 @@ class Editor extends Item {
     super.removeItemAsRelationship(item);
   }
 
-  removeAllRelationships() {
-    super.removeAllRelationships();
+  removeAndDirtyAllRelationships() {
+    super.removeAndDirtyAllRelationships();
     this.notes = [];
   }
 
diff --git a/app/assets/javascripts/app/frontend/models/app/note.js b/app/assets/javascripts/app/frontend/models/app/note.js
index 9e21c8693..e428b6717 100644
--- a/app/assets/javascripts/app/frontend/models/app/note.js
+++ b/app/assets/javascripts/app/frontend/models/app/note.js
@@ -48,7 +48,7 @@ class Note extends Item {
     super.removeItemAsRelationship(item);
   }
 
-  removeAllRelationships() {
+  removeAndDirtyAllRelationships() {
     this.tags.forEach(function(tag){
       _.pull(tag.notes, this);
       tag.setDirty(true);
diff --git a/app/assets/javascripts/app/frontend/models/app/tag.js b/app/assets/javascripts/app/frontend/models/app/tag.js
index e155de1b0..f94ee4151 100644
--- a/app/assets/javascripts/app/frontend/models/app/tag.js
+++ b/app/assets/javascripts/app/frontend/models/app/tag.js
@@ -46,7 +46,7 @@ class Tag extends Item {
     super.removeItemAsRelationship(item);
   }
 
-  removeAllRelationships() {
+  removeAndDirtyAllRelationships() {
     this.notes.forEach(function(note){
       _.pull(note.tags, this);
       note.setDirty(true);
diff --git a/app/assets/javascripts/app/services/modelManager.js b/app/assets/javascripts/app/services/modelManager.js
index 3a8014664..f1c8d587a 100644
--- a/app/assets/javascripts/app/services/modelManager.js
+++ b/app/assets/javascripts/app/services/modelManager.js
@@ -320,7 +320,7 @@ class ModelManager {
     if(!item.dummy) {
       item.setDirty(true);
     }
-    item.removeAllRelationships();
+    item.removeAndDirtyAllRelationships();
   }
 
   /* Used when changing encryption key */
@@ -363,14 +363,6 @@ class ModelManager {
     itemOne.setDirty(true);
     itemTwo.setDirty(true);
   }
-
-  removeRelationshipBetweenItems(itemOne, itemTwo) {
-    itemOne.removeItemAsRelationship(itemTwo);
-    itemTwo.removeItemAsRelationship(itemOne);
-
-    itemOne.setDirty(true);
-    itemTwo.setDirty(true);
-  }
 }
 
 angular.module('app.frontend').service('modelManager', ModelManager);