From cd60ad426749107441b047931e61415b27a8bda4 Mon Sep 17 00:00:00 2001 From: zadam Date: Sat, 3 Dec 2022 21:11:49 +0100 Subject: [PATCH] improvements --- package.json | 6 +++--- .../app/widgets/buttons/launcher/abstract_launcher.js | 6 +++++- src/public/app/widgets/containers/launcher_container.js | 6 +++--- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 5377be60b..270a107a8 100644 --- a/package.json +++ b/package.json @@ -50,8 +50,8 @@ "express-partial-content": "1.0.2", "express-rate-limit": "6.7.0", "express-session": "1.17.3", - "fs-extra": "10.1.0", - "helmet": "6.0.0", + "fs-extra": "11.1.0", + "helmet": "6.0.1", "html": "1.0.0", "html2plaintext": "2.1.4", "http-proxy-agent": "5.0.0", @@ -65,7 +65,7 @@ "jsdom": "20.0.3", "mime-types": "2.1.35", "multer": "1.4.5-lts.1", - "node-abi": "3.28.0", + "node-abi": "3.30.0", "normalize-strings": "1.1.1", "open": "8.4.0", "rand-token": "1.0.1", diff --git a/src/public/app/widgets/buttons/launcher/abstract_launcher.js b/src/public/app/widgets/buttons/launcher/abstract_launcher.js index f970710b8..25f4cc0d4 100644 --- a/src/public/app/widgets/buttons/launcher/abstract_launcher.js +++ b/src/public/app/widgets/buttons/launcher/abstract_launcher.js @@ -7,6 +7,10 @@ export default class AbstractLauncher extends OnClickButtonWidget { /** @type {NoteShort} */ this.launcherNote = launcherNote; + + for (const label of launcherNote.getOwnedLabels('keyboardShortcut')) { + this.bindNoteShortcutHandler(label); + } } launch() { @@ -30,4 +34,4 @@ export default class AbstractLauncher extends OnClickButtonWidget { } } } -} \ No newline at end of file +} diff --git a/src/public/app/widgets/containers/launcher_container.js b/src/public/app/widgets/containers/launcher_container.js index 3ff2755e0..d71c3958f 100644 --- a/src/public/app/widgets/containers/launcher_container.js +++ b/src/public/app/widgets/containers/launcher_container.js @@ -61,9 +61,9 @@ export default class LauncherContainer extends FlexContainer { } entitiesReloadedEvent({loadResults}) { - if (loadResults.getNoteIds().find(noteId => froca.notes[noteId]?.isLaunchBarConfig()) - || loadResults.getBranches().find(branch => branch.parentNoteId.startsWith("lb_")) - || loadResults.getAttributes().find(attr => froca.notes[attr.noteId]?.isLaunchBarConfig())) { + if (loadResults.getBranches().find(branch => branch.parentNoteId.startsWith("lb_"))) { + // changes in note placement requires reload of all launchers, all other changes are handled by individual + // launchers this.load(); } }