aboutsummaryrefslogtreecommitdiffstats
path: root/src/components/layout/Sidebar.js
diff options
context:
space:
mode:
authorLibravatar Amine El Mouafik <412895+kytwb@users.noreply.github.com>2021-02-08 10:34:45 +0100
committerLibravatar GitHub <noreply@github.com>2021-02-08 10:34:45 +0100
commit035002ceedf78d5ec73eabc0df7f06139939b967 (patch)
tree1c0d1e9531bae05fb65d70b9ea25baf404b74fe1 /src/components/layout/Sidebar.js
parentdocs: add k0staa as a contributor (#1193) (diff)
downloadferdium-app-035002ceedf78d5ec73eabc0df7f06139939b967.tar.gz
ferdium-app-035002ceedf78d5ec73eabc0df7f06139939b967.tar.zst
ferdium-app-035002ceedf78d5ec73eabc0df7f06139939b967.zip
Synchronize with Franz 5.6.0 (#1033)
Co-authored-by: FranzBot <i18n@meetfranz.com> Co-authored-by: vantezzen <hello@vantezzen.io> Co-authored-by: Makazzz <makazzzpro@live.ca> Co-authored-by: Stefan Malzner <stefan@adlk.io> Co-authored-by: Amine Mouafik <amine@mouafik.fr>
Diffstat (limited to 'src/components/layout/Sidebar.js')
-rw-r--r--src/components/layout/Sidebar.js3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js
index 90bbe86e9..a47e74db0 100644
--- a/src/components/layout/Sidebar.js
+++ b/src/components/layout/Sidebar.js
@@ -60,6 +60,7 @@ export default @inject('stores', 'actions') @observer class Sidebar extends Comp
60 isAppMuted: PropTypes.bool.isRequired, 60 isAppMuted: PropTypes.bool.isRequired,
61 isWorkspaceDrawerOpen: PropTypes.bool.isRequired, 61 isWorkspaceDrawerOpen: PropTypes.bool.isRequired,
62 toggleWorkspaceDrawer: PropTypes.func.isRequired, 62 toggleWorkspaceDrawer: PropTypes.func.isRequired,
63 isTodosServiceActive: PropTypes.bool.isRequired,
63 }; 64 };
64 65
65 static contextTypes = { 66 static contextTypes = {
@@ -96,6 +97,7 @@ export default @inject('stores', 'actions') @observer class Sidebar extends Comp
96 toggleWorkspaceDrawer, 97 toggleWorkspaceDrawer,
97 stores, 98 stores,
98 actions, 99 actions,
100 isTodosServiceActive,
99 } = this.props; 101 } = this.props;
100 const { intl } = this.context; 102 const { intl } = this.context;
101 const todosToggleMessage = ( 103 const todosToggleMessage = (
@@ -140,6 +142,7 @@ export default @inject('stores', 'actions') @observer class Sidebar extends Comp
140 todoActions.toggleTodosPanel(); 142 todoActions.toggleTodosPanel();
141 this.updateToolTip(); 143 this.updateToolTip();
142 }} 144 }}
145 disblaed={isTodosServiceActive}
143 className={`sidebar__button sidebar__button--todos ${todosStore.isTodosPanelVisible ? 'is-active' : ''}`} 146 className={`sidebar__button sidebar__button--todos ${todosStore.isTodosPanelVisible ? 'is-active' : ''}`}
144 data-tip={`${intl.formatMessage(todosToggleMessage)} (${ctrlKey}+T)`} 147 data-tip={`${intl.formatMessage(todosToggleMessage)} (${ctrlKey}+T)`}
145 > 148 >