diff options
author | 2020-02-29 19:00:37 +0100 | |
---|---|---|
committer | 2020-02-29 19:00:37 +0100 | |
commit | 0cd1b84366f02eefc4a806a4aad034689d7a2540 (patch) | |
tree | 7b8f871b38b2ca1257ed7ae7e182e98ccbda5063 /src/lib | |
parent | Fix anchor link to contributors in table of contents (diff) | |
download | ferdium-app-0cd1b84366f02eefc4a806a4aad034689d7a2540.tar.gz ferdium-app-0cd1b84366f02eefc4a806a4aad034689d7a2540.tar.zst ferdium-app-0cd1b84366f02eefc4a806a4aad034689d7a2540.zip |
#416 Fix regression in Menu builder
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/Menu.js | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/lib/Menu.js b/src/lib/Menu.js index 91e7c981a..1c4cc6ab5 100644 --- a/src/lib/Menu.js +++ b/src/lib/Menu.js | |||
@@ -755,7 +755,7 @@ export default class FranzMenu { | |||
755 | : _titleBarTemplateFactory(intl, this.stores.settings.app.locked); | 755 | : _titleBarTemplateFactory(intl, this.stores.settings.app.locked); |
756 | const { actions } = this; | 756 | const { actions } = this; |
757 | 757 | ||
758 | if (this.stores.settings.app.locked) { | 758 | if (!this.stores.settings.app.locked) { |
759 | tpl[1].submenu.push({ | 759 | tpl[1].submenu.push({ |
760 | type: 'separator', | 760 | type: 'separator', |
761 | }, { | 761 | }, { |
@@ -964,19 +964,19 @@ export default class FranzMenu { | |||
964 | }, about); | 964 | }, about); |
965 | } | 965 | } |
966 | 966 | ||
967 | if (serviceTpl.length > 0) { | 967 | if (!this.stores.settings.app.locked) { |
968 | tpl[3].submenu = serviceTpl; | 968 | if (serviceTpl.length > 0) { |
969 | } | 969 | tpl[3].submenu = serviceTpl; |
970 | } | ||
970 | 971 | ||
971 | if (workspaceStore.isFeatureEnabled) { | 972 | if (workspaceStore.isFeatureEnabled) { |
972 | tpl[4].submenu = this.workspacesMenu(); | 973 | tpl[4].submenu = this.workspacesMenu(); |
973 | } | 974 | } |
974 | 975 | ||
975 | if (todosStore.isFeatureEnabled) { | 976 | if (todosStore.isFeatureEnabled) { |
976 | tpl[5].submenu = this.todosMenu(); | 977 | tpl[5].submenu = this.todosMenu(); |
977 | } | 978 | } |
978 | 979 | ||
979 | if (!this.stores.settings.app.locked) { | ||
980 | tpl[tpl.length - 1].submenu.push({ | 980 | tpl[tpl.length - 1].submenu.push({ |
981 | type: 'separator', | 981 | type: 'separator', |
982 | }, ...this.debugMenu()); | 982 | }, ...this.debugMenu()); |