From 743979266a88dc8e5b7d30933305d8df67c9d315 Mon Sep 17 00:00:00 2001 From: zadam Date: Sun, 15 Jan 2023 19:46:32 +0100 Subject: [PATCH] fix history navigation buttons in server, #3527 --- package-lock.json | 2 +- src/public/app/widgets/buttons/command_button.js | 2 +- src/public/app/widgets/buttons/history_navigation.js | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index c05b691e7..fac982e30 100644 --- a/package-lock.json +++ b/package-lock.json @@ -30,7 +30,7 @@ "electron-debug": "3.2.0", "electron-dl": "3.5.0", "electron-window-state": "5.0.3", - "escape-html": "^1.0.3", + "escape-html": "1.0.3", "express": "4.18.2", "express-partial-content": "1.0.2", "express-rate-limit": "6.7.0", diff --git a/src/public/app/widgets/buttons/command_button.js b/src/public/app/widgets/buttons/command_button.js index 376c5a822..12e0dd821 100644 --- a/src/public/app/widgets/buttons/command_button.js +++ b/src/public/app/widgets/buttons/command_button.js @@ -39,7 +39,7 @@ export default class CommandButtonWidget extends AbstractButtonWidget { /** * @param {function|string} command - * @returns {CommandButtonWidget} + * @returns {this} */ command(command) { this.settings.command = command; diff --git a/src/public/app/widgets/buttons/history_navigation.js b/src/public/app/widgets/buttons/history_navigation.js index 430aeae21..08a86810f 100644 --- a/src/public/app/widgets/buttons/history_navigation.js +++ b/src/public/app/widgets/buttons/history_navigation.js @@ -23,6 +23,10 @@ export default class HistoryNavigationButton extends ButtonFromNoteWidget { doRender() { super.doRender(); + if (!utils.isElectron()) { + return; + } + this.webContents = utils.dynamicRequire('@electron/remote').getCurrentWebContents(); // without this the history is preserved across frontend reloads