aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/Menu.js
diff options
context:
space:
mode:
authorLibravatar vantezzen <hello@vantezzen.io>2019-10-02 13:57:24 +0200
committerLibravatar vantezzen <hello@vantezzen.io>2019-10-02 13:57:24 +0200
commit53c16e91b58d0abe3cde88acd05fddbdfc3c683c (patch)
tree6b3394aabdedc070f6b9e179457627b435b69ad9 /src/lib/Menu.js
parentFix Ferdi Lock not corrently locking (diff)
parentfix(Spell check): Fix spell checker to initialize without loaded dictionary (diff)
downloadferdium-app-53c16e91b58d0abe3cde88acd05fddbdfc3c683c.tar.gz
ferdium-app-53c16e91b58d0abe3cde88acd05fddbdfc3c683c.tar.zst
ferdium-app-53c16e91b58d0abe3cde88acd05fddbdfc3c683c.zip
Merge branch 'release/5.4.0' of https://github.com/meetfranz/franz into franz-5.4.0
Diffstat (limited to 'src/lib/Menu.js')
-rw-r--r--src/lib/Menu.js7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index beaafb4d1..7e336c994 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -325,6 +325,9 @@ const _templateFactory = intl => [
325 label: intl.formatMessage(menuItems.pasteAndMatchStyle), 325 label: intl.formatMessage(menuItems.pasteAndMatchStyle),
326 accelerator: 'Cmd+Shift+V', 326 accelerator: 'Cmd+Shift+V',
327 selector: 'pasteAndMatchStyle:', 327 selector: 'pasteAndMatchStyle:',
328 click() {
329 getActiveWebview().pasteAndMatchStyle();
330 },
328 }, 331 },
329 { 332 {
330 label: intl.formatMessage(menuItems.delete), 333 label: intl.formatMessage(menuItems.delete),
@@ -985,6 +988,10 @@ export default class FranzMenu {
985 checked: service.isActive, 988 checked: service.isActive,
986 click: () => { 989 click: () => {
987 this.actions.service.setActive({ serviceId: service.id }); 990 this.actions.service.setActive({ serviceId: service.id });
991
992 if (isMac && i === 0) {
993 app.mainWindow.restore();
994 }
988 }, 995 },
989 }))); 996 })));
990 997