diff options
author | Christopher Speller <crspeller@gmail.com> | 2015-12-15 09:03:06 -0500 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2015-12-15 09:03:06 -0500 |
commit | 2980a56370dfe150952beeb97c25e5e21e7fc7e5 (patch) | |
tree | 02308cc7385328fc43ffb708dfd2d1c06354f216 /web/react/components/user_settings/custom_theme_chooser.jsx | |
parent | 385046946296b26555af373bbfc5f6ea96593cd2 (diff) | |
parent | 296d36cd35a91c18435058754af04b3915ab6c4a (diff) | |
download | chat-2980a56370dfe150952beeb97c25e5e21e7fc7e5.tar.gz chat-2980a56370dfe150952beeb97c25e5e21e7fc7e5.tar.bz2 chat-2980a56370dfe150952beeb97c25e5e21e7fc7e5.zip |
Merge pull request #1727 from mattermost/plt-1481
PLT-1481 Force all colorpickers to update after theme pasted in
Diffstat (limited to 'web/react/components/user_settings/custom_theme_chooser.jsx')
-rw-r--r-- | web/react/components/user_settings/custom_theme_chooser.jsx | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/web/react/components/user_settings/custom_theme_chooser.jsx b/web/react/components/user_settings/custom_theme_chooser.jsx index 778c74c23..55242ca7f 100644 --- a/web/react/components/user_settings/custom_theme_chooser.jsx +++ b/web/react/components/user_settings/custom_theme_chooser.jsx @@ -22,6 +22,15 @@ export default class CustomThemeChooser extends React.Component { }); $('.color-picker').on('changeColor', this.onPickerChange); } + componentDidUpdate() { + const theme = this.props.theme; + Constants.THEME_ELEMENTS.forEach((element) => { + if (theme.hasOwnProperty(element.id) && element.id !== 'codeTheme') { + $('#' + element.id).data('colorpicker').color.setColor(theme[element.id]); + $('#' + element.id).colorpicker('update'); + } + }); + } onPickerChange(e) { const theme = this.props.theme; theme[e.target.id] = e.color.toHex(); @@ -101,7 +110,7 @@ export default class CustomThemeChooser extends React.Component { <select className='form-control' type='text' - defaultValue={theme[element.id]} + value={theme[element.id]} onChange={this.onInputChange} > {codeThemeOptions} @@ -134,7 +143,7 @@ export default class CustomThemeChooser extends React.Component { <input className='form-control' type='text' - defaultValue={theme[element.id]} + value={theme[element.id]} onChange={this.onInputChange} /> <span className='input-group-addon'><i></i></span> |