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

Merge remote-tracking branch 'upstream/develop' into account-menu-react

Browse Source
This commit is contained in:
VardanHakobyan
2021-06-03 13:14:32 +04:00
parent 6a54ea90f9 275043519c
commit da5f25e809
4 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -108,13 +108,14 @@ export class NotesState {
}
}
async selectNote(uuid: UuidString): Promise<void> {
async selectNote(uuid: UuidString, userTriggered?: boolean): Promise<void> {
const note = this.application.findItem(uuid) as SNNote;
if (note) {
if (
this.io.activeModifiers.has(KeyboardModifier.Meta) ||
this.io.activeModifiers.has(KeyboardModifier.Ctrl)
userTriggered &&
(this.io.activeModifiers.has(KeyboardModifier.Meta) ||
this.io.activeModifiers.has(KeyboardModifier.Ctrl))
) {
if (this.selectedNotes[uuid]) {
delete this.selectedNotes[uuid];
@@ -124,7 +125,10 @@ export class NotesState {
this.lastSelectedNote = note;
});
}
} else if (this.io.activeModifiers.has(KeyboardModifier.Shift)) {
} else if (
userTriggered &&
this.io.activeModifiers.has(KeyboardModifier.Shift)
) {
await this.selectNotesRange(note);
} else {
const shouldSelectNote =