diff options
author | Christopher Speller <crspeller@gmail.com> | 2015-11-05 07:31:37 -0500 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2015-11-05 07:31:37 -0500 |
commit | 40eea5b5e31c807345b7e33e0faedbf8d00eab93 (patch) | |
tree | 9bd0949958978ae130ccf2e17bae6a59cc5a629b /web/react/components/user_settings/user_settings_appearance.jsx | |
parent | 72a18e7d1093effbfee6845254470b6842a92236 (diff) | |
parent | a809ff88625e0fbaab8d14e2d35e85abd8fe6111 (diff) | |
download | chat-40eea5b5e31c807345b7e33e0faedbf8d00eab93.tar.gz chat-40eea5b5e31c807345b7e33e0faedbf8d00eab93.tar.bz2 chat-40eea5b5e31c807345b7e33e0faedbf8d00eab93.zip |
Merge pull request #1308 from asaadmahmoodspin/plt-960
Plt 960 - Moving code themes into custom themes
Diffstat (limited to 'web/react/components/user_settings/user_settings_appearance.jsx')
-rw-r--r-- | web/react/components/user_settings/user_settings_appearance.jsx | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/web/react/components/user_settings/user_settings_appearance.jsx b/web/react/components/user_settings/user_settings_appearance.jsx index 425645c1f..d73b5f476 100644 --- a/web/react/components/user_settings/user_settings_appearance.jsx +++ b/web/react/components/user_settings/user_settings_appearance.jsx @@ -7,7 +7,6 @@ var Utils = require('../../utils/utils.jsx'); const CustomThemeChooser = require('./custom_theme_chooser.jsx'); const PremadeThemeChooser = require('./premade_theme_chooser.jsx'); -const CodeThemeChooser = require('./code_theme_chooser.jsx'); const AppDispatcher = require('../../dispatcher/app_dispatcher.jsx'); const Constants = require('../../utils/constants.jsx'); const ActionTypes = Constants.ActionTypes; @@ -19,7 +18,6 @@ export default class UserSettingsAppearance extends React.Component { this.onChange = this.onChange.bind(this); this.submitTheme = this.submitTheme.bind(this); this.updateTheme = this.updateTheme.bind(this); - this.updateCodeTheme = this.updateCodeTheme.bind(this); this.deactivate = this.deactivate.bind(this); this.resetFields = this.resetFields.bind(this); this.handleImportModal = this.handleImportModal.bind(this); @@ -100,10 +98,6 @@ export default class UserSettingsAppearance extends React.Component { ); } updateTheme(theme) { - if (!theme.codeTheme) { - theme.codeTheme = this.state.theme.codeTheme; - } - let themeChanged = this.state.theme.length === theme.length; if (!themeChanged) { for (const field in theme) { @@ -121,11 +115,6 @@ export default class UserSettingsAppearance extends React.Component { this.setState({theme}); Utils.applyTheme(theme); } - updateCodeTheme(codeTheme) { - var theme = this.state.theme; - theme.codeTheme = codeTheme; - this.updateTheme(theme); - } updateType(type) { this.setState({type}); } @@ -203,12 +192,6 @@ export default class UserSettingsAppearance extends React.Component { </div> {custom} <hr /> - <strong className='radio'>{'Code Theme'}</strong> - <CodeThemeChooser - theme={this.state.theme} - updateTheme={this.updateCodeTheme} - /> - <hr /> {serverError} <a className='btn btn-sm btn-primary' |