diff options
author | Stefan Malzner <stefan@adlk.io> | 2019-09-17 15:40:30 +0200 |
---|---|---|
committer | Stefan Malzner <stefan@adlk.io> | 2019-09-17 15:40:30 +0200 |
commit | 944caecd46a70838376fd73401db7ff89bb8ecf3 (patch) | |
tree | 499b8cd90bc5fc0b1005895cc8b19c37d972c3ed /src/lib/Menu.js | |
parent | Update CHANGELOG.md (diff) | |
parent | Bump version to 5.3.3 (diff) | |
download | ferdium-app-944caecd46a70838376fd73401db7ff89bb8ecf3.tar.gz ferdium-app-944caecd46a70838376fd73401db7ff89bb8ecf3.tar.zst ferdium-app-944caecd46a70838376fd73401db7ff89bb8ecf3.zip |
Merge branch 'develop'
Diffstat (limited to 'src/lib/Menu.js')
-rw-r--r-- | src/lib/Menu.js | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/lib/Menu.js b/src/lib/Menu.js index 4aa2edaba..b72f0df96 100644 --- a/src/lib/Menu.js +++ b/src/lib/Menu.js | |||
@@ -548,6 +548,11 @@ const _titleBarTemplateFactory = intl => [ | |||
548 | visible: workspaceStore.isFeatureEnabled, | 548 | visible: workspaceStore.isFeatureEnabled, |
549 | }, | 549 | }, |
550 | { | 550 | { |
551 | label: intl.formatMessage(menuItems.todos), | ||
552 | submenu: [], | ||
553 | visible: todosStore.isFeatureEnabled, | ||
554 | }, | ||
555 | { | ||
551 | label: intl.formatMessage(menuItems.window), | 556 | label: intl.formatMessage(menuItems.window), |
552 | submenu: [ | 557 | submenu: [ |
553 | { | 558 | { |
@@ -943,12 +948,12 @@ export default class FranzMenu { | |||
943 | gaEvent(GA_CATEGORY_TODOS, 'toggleDrawer', 'menu'); | 948 | gaEvent(GA_CATEGORY_TODOS, 'toggleDrawer', 'menu'); |
944 | }, | 949 | }, |
945 | enabled: this.stores.user.isLoggedIn && isFeatureEnabledByUser, | 950 | enabled: this.stores.user.isLoggedIn && isFeatureEnabledByUser, |
946 | }, { | ||
947 | type: 'separator', | ||
948 | }); | 951 | }); |
949 | 952 | ||
950 | if (!isFeatureEnabledByUser) { | 953 | if (!isFeatureEnabledByUser) { |
951 | menu.push({ | 954 | menu.push({ |
955 | type: 'separator', | ||
956 | }, { | ||
952 | label: intl.formatMessage(menuItems.enableTodos), | 957 | label: intl.formatMessage(menuItems.enableTodos), |
953 | click: () => { | 958 | click: () => { |
954 | todoActions.toggleTodosFeatureVisibility(); | 959 | todoActions.toggleTodosFeatureVisibility(); |