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

refactor: revert to passing note uuid to selectNote

Browse Source
This commit is contained in:
Antonella Sgarlatta
2021-05-11 19:19:53 -03:00
parent 8302733a49
commit ba71b56f00
1 changed files with 27 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
app/assets/javascripts/ui_models/app_state/notes_state.ts
View File

@@ -119,32 +119,35 @@ export class NotesState {
}, notesToSelect);
}
async selectNote(note: SNNote): Promise<void> {
if (
this.io.activeModifiers.has(
KeyboardModifier.Meta || KeyboardModifier.Ctrl
)
) {
if (this.selectedNotes[note.uuid]) {
delete this.selectedNotes[note.uuid];
} else if (await this.application.authorizeNoteAccess(note)) {
this.selectedNotes[note.uuid] = note;
this.lastSelectedNote = note;
}
} else if (this.io.activeModifiers.has(KeyboardModifier.Shift)) {
await this.selectNotesRange(note);
} else {
const shouldSelectNote =
this.selectedNotesCount > 1 || !this.selectedNotes[note.uuid];
async selectNote(uuid: UuidString): Promise<void> {
const note = this.application.findItem(uuid) as SNNote;
if (note) {
if (
shouldSelectNote &&
(await this.application.authorizeNoteAccess(note))
this.io.activeModifiers.has(
KeyboardModifier.Meta || KeyboardModifier.Ctrl
)
) {
this.selectedNotes = {
[note.uuid]: note,
};
await this.openEditor(note.uuid);
this.lastSelectedNote = note;
if (this.selectedNotes[note.uuid]) {
delete this.selectedNotes[note.uuid];
} else if (await this.application.authorizeNoteAccess(note)) {
this.selectedNotes[note.uuid] = note;
this.lastSelectedNote = note;
}
} else if (this.io.activeModifiers.has(KeyboardModifier.Shift)) {
await this.selectNotesRange(note);
} else {
const shouldSelectNote =
this.selectedNotesCount > 1 || !this.selectedNotes[note.uuid];
if (
shouldSelectNote &&
(await this.application.authorizeNoteAccess(note))
) {
this.selectedNotes = {
[note.uuid]: note,
};
await this.openEditor(note.uuid);
this.lastSelectedNote = note;
}
}
}
}