aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Sadetdin EYILI <sad270@users.noreply.github.com>2021-09-06 14:33:49 +0200
committerLibravatar GitHub <noreply@github.com>2021-09-06 18:03:49 +0530
commitc9efc2abfe4296e19617444a72319fbf53e4b359 (patch)
tree84ef5a9ef50e5fe1357d9b26869f2475252db701
parentcleanup: Remove redundant 'data.name' in workspaces. (diff)
downloadferdium-app-c9efc2abfe4296e19617444a72319fbf53e4b359.tar.gz
ferdium-app-c9efc2abfe4296e19617444a72319fbf53e4b359.tar.zst
ferdium-app-c9efc2abfe4296e19617444a72319fbf53e4b359.zip
Fix zoom actions executed on another services (#1875)
fixes #1867
-rw-r--r--CHANGELOG.md1
-rw-r--r--src/lib/Menu.js6
2 files changed, 1 insertions, 6 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index aa9c99c1e..c898e4188 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
4 4
5- Fix issue while importing exported `ferdi.data` file while switching from one laptop to another when it had workspaces (#1874) 💖 @vraravam 5- Fix issue while importing exported `ferdi.data` file while switching from one laptop to another when it had workspaces (#1874) 💖 @vraravam
6- Fix for 'Support' link not working (404 error) (#1806) 💖 @kytwb 6- Fix for 'Support' link not working (404 error) (#1806) 💖 @kytwb
7- Fix zoom actions executed on another services (#1867) 💖 @sad270
7 8
8# [v5.6.1-nightly.51](https://github.com/getferdi/ferdi/compare/v5.6.1-nightly.50...v5.6.1-nightly.51) (2021-09-06) 9# [v5.6.1-nightly.51](https://github.com/getferdi/ferdi/compare/v5.6.1-nightly.50...v5.6.1-nightly.51) (2021-09-06)
9 10
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) => [
362 label: intl.formatMessage(menuItems.pasteAndMatchStyle), 362 label: intl.formatMessage(menuItems.pasteAndMatchStyle),
363 accelerator: `${cmdOrCtrlShortcutKey()}+${shiftKey()}+V`, // Override the accelerator since this adds new key combo in macos 363 accelerator: `${cmdOrCtrlShortcutKey()}+${shiftKey()}+V`, // Override the accelerator since this adds new key combo in macos
364 role: 'pasteAndMatchStyle', 364 role: 'pasteAndMatchStyle',
365 click() {
366 getActiveService().webview.pasteAndMatchStyle();
367 },
368 }, 365 },
369 { 366 {
370 label: intl.formatMessage(menuItems.delete), 367 label: intl.formatMessage(menuItems.delete),
@@ -438,7 +435,6 @@ const _titleBarTemplateFactory = (intl, locked) => [
438 { 435 {
439 label: intl.formatMessage(menuItems.resetZoom), 436 label: intl.formatMessage(menuItems.resetZoom),
440 accelerator: `${cmdOrCtrlShortcutKey()}+0`, 437 accelerator: `${cmdOrCtrlShortcutKey()}+0`,
441 role: 'resetZoom',
442 click() { 438 click() {
443 this.actions.service.zoomResetForActiveService(); 439 this.actions.service.zoomResetForActiveService();
444 }, 440 },
@@ -446,7 +442,6 @@ const _titleBarTemplateFactory = (intl, locked) => [
446 { 442 {
447 label: intl.formatMessage(menuItems.zoomIn), 443 label: intl.formatMessage(menuItems.zoomIn),
448 accelerator: `${cmdOrCtrlShortcutKey()}+plus`, 444 accelerator: `${cmdOrCtrlShortcutKey()}+plus`,
449 role: 'zoomIn',
450 click() { 445 click() {
451 this.actions.service.zoomInForActiveService(); 446 this.actions.service.zoomInForActiveService();
452 }, 447 },
@@ -454,7 +449,6 @@ const _titleBarTemplateFactory = (intl, locked) => [
454 { 449 {
455 label: intl.formatMessage(menuItems.zoomOut), 450 label: intl.formatMessage(menuItems.zoomOut),
456 accelerator: `${cmdOrCtrlShortcutKey()}+-`, 451 accelerator: `${cmdOrCtrlShortcutKey()}+-`,
457 role: 'zoomOut',
458 click() { 452 click() {
459 this.actions.service.zoomOutForActiveService(); 453 this.actions.service.zoomOutForActiveService();
460 }, 454 },