Sync manager filter then slice, fix editor tags on blur, fix deletingnote with no title
This commit is contained in:
@@ -352,6 +352,11 @@ angular.module('app.frontend')
|
|||||||
|
|
||||||
this.onNameBlur = function() {
|
this.onNameBlur = function() {
|
||||||
this.editingName = false;
|
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() {
|
this.toggleFullScreen = function() {
|
||||||
@@ -366,7 +371,12 @@ angular.module('app.frontend')
|
|||||||
}
|
}
|
||||||
|
|
||||||
this.deleteNote = function() {
|
this.deleteNote = function() {
|
||||||
|
<<<<<<< HEAD
|
||||||
if(confirm("Are you sure you want to delete this note?")) {
|
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.remove()(this.note);
|
||||||
this.showMenu = false;
|
this.showMenu = false;
|
||||||
}
|
}
|
||||||
@@ -430,9 +440,7 @@ angular.module('app.frontend')
|
|||||||
this.loadTagsString();
|
this.loadTagsString();
|
||||||
}
|
}
|
||||||
|
|
||||||
this.updateTagsFromTagsString = function($event) {
|
this.updateTagsFromTagsString = function() {
|
||||||
$event.target.blur();
|
|
||||||
|
|
||||||
var tags = this.tagsString.split("#");
|
var tags = this.tagsString.split("#");
|
||||||
tags = _.filter(tags, function(tag){
|
tags = _.filter(tags, function(tag){
|
||||||
return tag.length > 0;
|
return tag.length > 0;
|
||||||
|
|||||||
Reference in New Issue
Block a user