diff options
author | 2019-03-23 14:15:57 +0100 | |
---|---|---|
committer | 2019-03-23 14:15:57 +0100 | |
commit | 0af622e6e81a5aee64f839eeadd23b4a62b3cf62 (patch) | |
tree | 0e2264b83c3f57f2850062f6b7293bf06416bb49 /src/lib | |
parent | fix merge conflicts with latest develop (diff) | |
download | ferdium-app-0af622e6e81a5aee64f839eeadd23b4a62b3cf62.tar.gz ferdium-app-0af622e6e81a5aee64f839eeadd23b4a62b3cf62.tar.zst ferdium-app-0af622e6e81a5aee64f839eeadd23b4a62b3cf62.zip |
refactor state management for workspace feature
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/Menu.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/Menu.js b/src/lib/Menu.js index 2a88515f4..3435e04f7 100644 --- a/src/lib/Menu.js +++ b/src/lib/Menu.js | |||
@@ -3,7 +3,7 @@ import { observable, autorun } from 'mobx'; | |||
3 | import { defineMessages } from 'react-intl'; | 3 | import { defineMessages } from 'react-intl'; |
4 | 4 | ||
5 | import { isMac, ctrlKey, cmdKey } from '../environment'; | 5 | import { isMac, ctrlKey, cmdKey } from '../environment'; |
6 | import { workspacesState } from '../features/workspaces/state'; | 6 | import { workspaceStore } from '../features/workspaces/index'; |
7 | import { workspaceActions } from '../features/workspaces/actions'; | 7 | import { workspaceActions } from '../features/workspaces/actions'; |
8 | 8 | ||
9 | const { app, Menu, dialog } = remote; | 9 | const { app, Menu, dialog } = remote; |
@@ -784,7 +784,7 @@ export default class FranzMenu { | |||
784 | } | 784 | } |
785 | 785 | ||
786 | workspacesMenu() { | 786 | workspacesMenu() { |
787 | const { workspaces, activeWorkspace } = workspacesState; | 787 | const { workspaces, activeWorkspace, isWorkspaceDrawerOpen } = workspaceStore; |
788 | const { intl } = window.franz; | 788 | const { intl } = window.franz; |
789 | const menu = []; | 789 | const menu = []; |
790 | 790 | ||
@@ -800,7 +800,7 @@ export default class FranzMenu { | |||
800 | 800 | ||
801 | // Open workspace drawer: | 801 | // Open workspace drawer: |
802 | const drawerLabel = ( | 802 | const drawerLabel = ( |
803 | workspacesState.isWorkspaceDrawerOpen ? menuItems.closeWorkspaceDrawer : menuItems.openWorkspaceDrawer | 803 | isWorkspaceDrawerOpen ? menuItems.closeWorkspaceDrawer : menuItems.openWorkspaceDrawer |
804 | ); | 804 | ); |
805 | menu.push({ | 805 | menu.push({ |
806 | label: intl.formatMessage(drawerLabel), | 806 | label: intl.formatMessage(drawerLabel), |