diff options
author | vantezzen <properly@protonmail.com> | 2019-09-13 17:59:46 +0200 |
---|---|---|
committer | vantezzen <properly@protonmail.com> | 2019-09-13 17:59:46 +0200 |
commit | fb095e4984210ec63c5834d6762dec43457dbc57 (patch) | |
tree | a2c8b353313cb363a56722687e110c6f80f4b791 /src/components/settings | |
parent | Use ferdi namespace on debugger (diff) | |
parent | Update CHANGELOG.md (diff) | |
download | ferdium-app-fb095e4984210ec63c5834d6762dec43457dbc57.tar.gz ferdium-app-fb095e4984210ec63c5834d6762dec43457dbc57.tar.zst ferdium-app-fb095e4984210ec63c5834d6762dec43457dbc57.zip |
Merge branch 'master' of https://github.com/meetfranz/franz into meetfranz-master
Diffstat (limited to 'src/components/settings')
-rw-r--r-- | src/components/settings/settings/EditSettingsForm.js | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index b026222c3..835fd394b 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js | |||
@@ -111,6 +111,7 @@ export default @observer class EditSettingsForm extends Component { | |||
111 | cacheSize: PropTypes.string.isRequired, | 111 | cacheSize: PropTypes.string.isRequired, |
112 | isSpellcheckerIncludedInCurrentPlan: PropTypes.bool.isRequired, | 112 | isSpellcheckerIncludedInCurrentPlan: PropTypes.bool.isRequired, |
113 | isTodosEnabled: PropTypes.bool.isRequired, | 113 | isTodosEnabled: PropTypes.bool.isRequired, |
114 | isWorkspaceEnabled: PropTypes.bool.isRequired, | ||
114 | }; | 115 | }; |
115 | 116 | ||
116 | static contextTypes = { | 117 | static contextTypes = { |
@@ -142,6 +143,7 @@ export default @observer class EditSettingsForm extends Component { | |||
142 | cacheSize, | 143 | cacheSize, |
143 | isSpellcheckerIncludedInCurrentPlan, | 144 | isSpellcheckerIncludedInCurrentPlan, |
144 | isTodosEnabled, | 145 | isTodosEnabled, |
146 | isWorkspaceEnabled, | ||
145 | } = this.props; | 147 | } = this.props; |
146 | const { intl } = this.context; | 148 | const { intl } = this.context; |
147 | 149 | ||
@@ -182,9 +184,12 @@ export default @observer class EditSettingsForm extends Component { | |||
182 | field={form.$('server')} | 184 | field={form.$('server')} |
183 | autoFocus | 185 | autoFocus |
184 | /> | 186 | /> |
185 | { isLoggedIn && ( | 187 | {isLoggedIn && ( |
186 | <p>{ intl.formatMessage(messages.serverInfo) }</p> | 188 | <p>{ intl.formatMessage(messages.serverInfo) }</p> |
187 | )} | 189 | )} |
190 | {isWorkspaceEnabled && ( | ||
191 | <Toggle field={form.$('keepAllWorkspacesLoaded')} /> | ||
192 | )} | ||
188 | {isTodosEnabled && ( | 193 | {isTodosEnabled && ( |
189 | <> | 194 | <> |
190 | <Toggle field={form.$('enableTodos')} /> | 195 | <Toggle field={form.$('enableTodos')} /> |