From c9efc2abfe4296e19617444a72319fbf53e4b359 Mon Sep 17 00:00:00 2001 From: Sadetdin EYILI Date: Mon, 6 Sep 2021 14:33:49 +0200 Subject: Fix zoom actions executed on another services (#1875) fixes #1867 --- CHANGELOG.md | 1 + src/lib/Menu.js | 6 ------ 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aa9c99c1e..c898e4188 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - Fix issue while importing exported `ferdi.data` file while switching from one laptop to another when it had workspaces (#1874) 💖 @vraravam - Fix for 'Support' link not working (404 error) (#1806) 💖 @kytwb +- Fix zoom actions executed on another services (#1867) 💖 @sad270 # [v5.6.1-nightly.51](https://github.com/getferdi/ferdi/compare/v5.6.1-nightly.50...v5.6.1-nightly.51) (2021-09-06) diff --git a/src/lib/Menu.js b/src/lib/Menu.js index 1843ca6c6..01bdb0bec 100644 --- a/src/lib/Menu.js +++ b/src/lib/Menu.js @@ -362,9 +362,6 @@ const _titleBarTemplateFactory = (intl, locked) => [ label: intl.formatMessage(menuItems.pasteAndMatchStyle), accelerator: `${cmdOrCtrlShortcutKey()}+${shiftKey()}+V`, // Override the accelerator since this adds new key combo in macos role: 'pasteAndMatchStyle', - click() { - getActiveService().webview.pasteAndMatchStyle(); - }, }, { label: intl.formatMessage(menuItems.delete), @@ -438,7 +435,6 @@ const _titleBarTemplateFactory = (intl, locked) => [ { label: intl.formatMessage(menuItems.resetZoom), accelerator: `${cmdOrCtrlShortcutKey()}+0`, - role: 'resetZoom', click() { this.actions.service.zoomResetForActiveService(); }, @@ -446,7 +442,6 @@ const _titleBarTemplateFactory = (intl, locked) => [ { label: intl.formatMessage(menuItems.zoomIn), accelerator: `${cmdOrCtrlShortcutKey()}+plus`, - role: 'zoomIn', click() { this.actions.service.zoomInForActiveService(); }, @@ -454,7 +449,6 @@ const _titleBarTemplateFactory = (intl, locked) => [ { label: intl.formatMessage(menuItems.zoomOut), accelerator: `${cmdOrCtrlShortcutKey()}+-`, - role: 'zoomOut', click() { this.actions.service.zoomOutForActiveService(); }, -- cgit v1.2.3-54-g00ecf