diff options
author | Asaad Mahmood <asaadmahmood@users.noreply.github.com> | 2016-08-01 20:17:27 +0500 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2016-08-01 11:17:27 -0400 |
commit | b263b0eb98678a8a55d8c8adeb9bb22323a706f6 (patch) | |
tree | 330b39eb09734c7d5c3033fc7375ccf518fdd0d1 /webapp/components/user_settings/custom_theme_chooser.jsx | |
parent | 0b5a25a39ef5aaca7044118d6fd9abd099e40697 (diff) | |
download | chat-b263b0eb98678a8a55d8c8adeb9bb22323a706f6.tar.gz chat-b263b0eb98678a8a55d8c8adeb9bb22323a706f6.tar.bz2 chat-b263b0eb98678a8a55d8c8adeb9bb22323a706f6.zip |
Multiple Ui improvements (#3678)
* Adding permalink back to mobile
* Improving reply flow and fixing colorpicker on mobile
* Hiding colorpicker on click only for mobile size screens
Diffstat (limited to 'webapp/components/user_settings/custom_theme_chooser.jsx')
-rw-r--r-- | webapp/components/user_settings/custom_theme_chooser.jsx | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/webapp/components/user_settings/custom_theme_chooser.jsx b/webapp/components/user_settings/custom_theme_chooser.jsx index b080c879d..016751faa 100644 --- a/webapp/components/user_settings/custom_theme_chooser.jsx +++ b/webapp/components/user_settings/custom_theme_chooser.jsx @@ -119,11 +119,13 @@ class CustomThemeChooser extends React.Component { }); $('.color-picker').on('changeColor', this.onPickerChange); $('.group--code').on('change', this.onCodeThemeChange); + document.addEventListener('click', this.closeColorpicker); } componentWillUnmount() { $('.color-picker').off('changeColor', this.onPickerChange); $('.group--code').off('change', this.onCodeThemeChange); + document.removeEventListener('click', this.closeColorpicker); } componentDidUpdate() { @@ -136,6 +138,12 @@ class CustomThemeChooser extends React.Component { }); } + closeColorpicker(e) { + if (!$(e.target).closest('.color-picker').length && Utils.isMobile()) { + $('.color-picker').colorpicker('hide'); + } + } + onPickerChange(e) { const inputBox = e.target.childNodes[0]; if (document.activeElement === inputBox && inputBox.value.length !== HEX_CODE_LENGTH) { |