rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Editor merges

Browse Source
This commit is contained in:
Mo Bitar
2017-11-04 20:58:31 -05:00
parent 883d6525a8
commit bc1520ffd7
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/javascripts/app/frontend/controllers/editor.js
View File

@@ -352,11 +352,7 @@ angular.module('app.frontend')
this.onNameBlur = function() { this.onNameBlur = function() {
this.editingName = false; this.editingName = false;
<<<<<<< HEAD
=======
keyboardManager.unlockKeyboardContext();
this.updateTagsFromTagsString() this.updateTagsFromTagsString()
>>>>>>> c73cc80... Sync manager filter then slice, fix editor tags on blur, fix deleting note with no title
} }
this.toggleFullScreen = function() { this.toggleFullScreen = function() {
@@ -371,12 +367,8 @@ angular.module('app.frontend')
} }
this.deleteNote = function() { 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"; let title = this.note.safeTitle().length ? `'${this.note.title}'` : "this note";
if(confirm(`Are you sure you want to delete ${title}?`)) { 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.remove()(this.note);
this.showMenu = false; this.showMenu = false;
} }