From bc1520ffd78f5a30bdbb4c2f0dd8fb417b208c7f Mon Sep 17 00:00:00 2001 From: Mo Bitar Date: Sat, 4 Nov 2017 20:58:31 -0500 Subject: [PATCH] Editor merges --- app/assets/javascripts/app/frontend/controllers/editor.js | 8 -------- 1 file changed, 8 deletions(-) diff --git a/app/assets/javascripts/app/frontend/controllers/editor.js b/app/assets/javascripts/app/frontend/controllers/editor.js index 9be86953d..8634475d1 100644 --- a/app/assets/javascripts/app/frontend/controllers/editor.js +++ b/app/assets/javascripts/app/frontend/controllers/editor.js @@ -352,11 +352,7 @@ angular.module('app.frontend') this.onNameBlur = function() { this.editingName = false; -<<<<<<< HEAD -======= - keyboardManager.unlockKeyboardContext(); this.updateTagsFromTagsString() ->>>>>>> c73cc80... Sync manager filter then slice, fix editor tags on blur, fix deleting note with no title } this.toggleFullScreen = function() { @@ -371,12 +367,8 @@ angular.module('app.frontend') } this.deleteNote = function() { -<<<<<<< HEAD - 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}?`)) { ->>>>>>> c73cc80... Sync manager filter then slice, fix editor tags on blur, fix deleting note with no title this.remove()(this.note); this.showMenu = false; }