This commit is contained in:
Mo Bitar
2020-04-14 19:59:31 -05:00
parent d91b7bc449
commit a2303aa7af
7 changed files with 37 additions and 61 deletions

View File

@@ -39,7 +39,7 @@
application='self.application'
)
input.tags-input(
ng-blur='self.saveTagsFromStrings()',
ng-blur='self.onTagsInputBlur()',
ng-disabled='self.noteLocked',
ng-if='!(self.state.tagsComponent && self.state.tagsComponent.active)',
ng-keyup='$event.keyCode == 13 && $event.target.blur();',

View File

@@ -447,7 +447,6 @@ class EditorViewCtrl extends PureViewCtrl implements EditorViewScope {
return;
}
if (this.editor.isTemplateNote) {
console.log("is template");
await this.editor.insertTemplatedNote();
if (this.appState.selectedTag) {
await this.application.changeItem(
@@ -793,6 +792,11 @@ class EditorViewCtrl extends PureViewCtrl implements EditorViewScope {
this.saveTagsFromStrings(strings);
}
onTagsInputBlur() {
this.saveTagsFromStrings();
this.focusEditor();
}
public async saveTagsFromStrings(strings?: string[]) {
if (
!strings

View File

@@ -167,21 +167,19 @@ class NotesViewCtrl extends PureViewCtrl {
}
/**
* @access private
* Access the current state notes without awaiting any potential reloads
* that may be in progress. This is the sync alternative to `async getMostValidNotes`
*/
getPossiblyStaleNotes() {
private getPossiblyStaleNotes() {
return this.getState().notes!;
}
/**
* @access private
* Access the current state notes after waiting for any pending reloads.
* This returns the most up to date notes, but is the asyncronous counterpart
* to `getPossiblyStaleNotes`
*/
async getMostValidNotes() {
private async getMostValidNotes() {
await this.reloadNotesPromise;
return this.getPossiblyStaleNotes();
}
@@ -190,9 +188,8 @@ class NotesViewCtrl extends PureViewCtrl {
* Triggered programatically to create a new placeholder note
* when conditions allow for it. This is as opposed to creating a new note
* as part of user interaction (pressing the + button).
* @access private
*/
async createPlaceholderNote() {
private async createPlaceholderNote() {
const selectedTag = this.application!.getAppState().getSelectedTag()!;
if (selectedTag.isSmartTag() && !selectedTag.isAllTag) {
return;