diff options
author | Abin Mn <abinmn619@gmail.com> | 2021-10-26 21:18:20 +0530 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-26 21:18:20 +0530 |
commit | 91c69428ed0dc2dd26b00c6dd5a6684f25515a34 (patch) | |
tree | 062a9a4946aa1367263533682ee59e795ea97234 /src/lib | |
parent | Add feature to display service name under service icon when the toggle for it... (diff) | |
download | ferdium-app-91c69428ed0dc2dd26b00c6dd5a6684f25515a34.tar.gz ferdium-app-91c69428ed0dc2dd26b00c6dd5a6684f25515a34.tar.zst ferdium-app-91c69428ed0dc2dd26b00c6dd5a6684f25515a34.zip |
Cleanup/remove feature toggle for todo, workspace, service proxy (#2134)
* Remove DEFAULT_FEATURES_CONFIG from config
* Remove static controller
Co-authored-by: Madhuri B <MadhuriBandanadam@users.noreply.github.com>
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/Menu.js | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/src/lib/Menu.js b/src/lib/Menu.js index 1495fc80e..7d4c228f5 100644 --- a/src/lib/Menu.js +++ b/src/lib/Menu.js | |||
@@ -21,7 +21,6 @@ import { | |||
21 | muteFerdiShortcutKey, | 21 | muteFerdiShortcutKey, |
22 | } from '../environment'; | 22 | } from '../environment'; |
23 | import { aboutAppDetails, ferdiVersion } from '../environment-remote'; | 23 | import { aboutAppDetails, ferdiVersion } from '../environment-remote'; |
24 | import { todosStore } from '../features/todos'; | ||
25 | import { todoActions } from '../features/todos/actions'; | 24 | import { todoActions } from '../features/todos/actions'; |
26 | import { workspaceActions } from '../features/workspaces/actions'; | 25 | import { workspaceActions } from '../features/workspaces/actions'; |
27 | import { workspaceStore } from '../features/workspaces/index'; | 26 | import { workspaceStore } from '../features/workspaces/index'; |
@@ -479,12 +478,12 @@ const _titleBarTemplateFactory = (intl, locked) => [ | |||
479 | label: intl.formatMessage(menuItems.workspaces), | 478 | label: intl.formatMessage(menuItems.workspaces), |
480 | accelerator: `${altKey()}+W`, | 479 | accelerator: `${altKey()}+W`, |
481 | submenu: [], | 480 | submenu: [], |
482 | visible: !locked && workspaceStore.isFeatureEnabled, | 481 | visible: !locked, |
483 | }, | 482 | }, |
484 | { | 483 | { |
485 | label: intl.formatMessage(menuItems.todos), | 484 | label: intl.formatMessage(menuItems.todos), |
486 | submenu: [], | 485 | submenu: [], |
487 | visible: !locked && todosStore.isFeatureEnabled, | 486 | visible: !locked, |
488 | }, | 487 | }, |
489 | { | 488 | { |
490 | label: intl.formatMessage(menuItems.window), | 489 | label: intl.formatMessage(menuItems.window), |
@@ -698,13 +697,9 @@ class FranzMenu { | |||
698 | tpl[2].submenu = serviceTpl; | 697 | tpl[2].submenu = serviceTpl; |
699 | } | 698 | } |
700 | 699 | ||
701 | if (workspaceStore.isFeatureEnabled) { | 700 | tpl[3].submenu = this.workspacesMenu(); |
702 | tpl[3].submenu = this.workspacesMenu(); | ||
703 | } | ||
704 | 701 | ||
705 | if (todosStore.isFeatureEnabled) { | 702 | tpl[4].submenu = this.todosMenu(); |
706 | tpl[4].submenu = this.todosMenu(); | ||
707 | } | ||
708 | } else { | 703 | } else { |
709 | const touchIdEnabled = isMac | 704 | const touchIdEnabled = isMac |
710 | ? this.stores.settings.app.useTouchIdToUnlock && | 705 | ? this.stores.settings.app.useTouchIdToUnlock && |
@@ -872,13 +867,9 @@ class FranzMenu { | |||
872 | tpl[3].submenu = serviceTpl; | 867 | tpl[3].submenu = serviceTpl; |
873 | } | 868 | } |
874 | 869 | ||
875 | if (workspaceStore.isFeatureEnabled) { | 870 | tpl[4].submenu = this.workspacesMenu(); |
876 | tpl[4].submenu = this.workspacesMenu(); | ||
877 | } | ||
878 | 871 | ||
879 | if (todosStore.isFeatureEnabled) { | 872 | tpl[5].submenu = this.todosMenu(); |
880 | tpl[5].submenu = this.todosMenu(); | ||
881 | } | ||
882 | 873 | ||
883 | tpl[tpl.length - 1].submenu.push( | 874 | tpl[tpl.length - 1].submenu.push( |
884 | { | 875 | { |