diff options
author | Makazzz <makazzzpro@live.ca> | 2019-10-06 16:33:05 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-06 16:33:05 -0400 |
commit | ba4d77fb0b1f3baa76f40642ba863f5454802982 (patch) | |
tree | f4b50c96b3e134c713f4a8961d547d168dfb6972 /src/lib/Menu.js | |
parent | Better handling for user data path (#100) (diff) | |
parent | Add more screenshots (diff) | |
download | ferdium-app-ba4d77fb0b1f3baa76f40642ba863f5454802982.tar.gz ferdium-app-ba4d77fb0b1f3baa76f40642ba863f5454802982.tar.zst ferdium-app-ba4d77fb0b1f3baa76f40642ba863f5454802982.zip |
Merge pull request #29 from getferdi/develop
[pull] develop from getferdi:develop
Diffstat (limited to 'src/lib/Menu.js')
-rw-r--r-- | src/lib/Menu.js | 7 |
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 | ||