diff options
Diffstat (limited to 'webapp/components')
| -rw-r--r-- | webapp/components/post_view/components/post_info.jsx | 32 | ||||
| -rw-r--r-- | webapp/components/rhs_comment.jsx | 32 | ||||
| -rw-r--r-- | webapp/components/rhs_root_post.jsx | 32 | ||||
| -rw-r--r-- | webapp/components/search_bar.jsx | 2 | ||||
| -rw-r--r-- | webapp/components/user_settings/custom_theme_chooser.jsx | 8 |
5 files changed, 55 insertions, 51 deletions
diff --git a/webapp/components/post_view/components/post_info.jsx b/webapp/components/post_view/components/post_info.jsx index 9cb1e751d..ba6a9a982 100644 --- a/webapp/components/post_view/components/post_info.jsx +++ b/webapp/components/post_view/components/post_info.jsx @@ -74,24 +74,22 @@ export default class PostInfo extends React.Component { ); } - if (!Utils.isMobile()) { - dropdownContents.push( - <li - key='copyLink' - role='presentation' + dropdownContents.push( + <li + key='copyLink' + role='presentation' + > + <a + href='#' + onClick={this.handlePermalink} > - <a - href='#' - onClick={this.handlePermalink} - > - <FormattedMessage - id='post_info.permalink' - defaultMessage='Permalink' - /> - </a> - </li> - ); - } + <FormattedMessage + id='post_info.permalink' + defaultMessage='Permalink' + /> + </a> + </li> + ); if (isOwner || isAdmin) { dropdownContents.push( diff --git a/webapp/components/rhs_comment.jsx b/webapp/components/rhs_comment.jsx index 758642cae..ed1f71b1e 100644 --- a/webapp/components/rhs_comment.jsx +++ b/webapp/components/rhs_comment.jsx @@ -66,24 +66,22 @@ export default class RhsComment extends React.Component { var dropdownContents = []; - if (!Utils.isMobile()) { - dropdownContents.push( - <li - key='rhs-root-permalink' - role='presentation' + dropdownContents.push( + <li + key='rhs-root-permalink' + role='presentation' + > + <a + href='#' + onClick={this.handlePermalink} > - <a - href='#' - onClick={this.handlePermalink} - > - <FormattedMessage - id='rhs_comment.permalink' - defaultMessage='Permalink' - /> - </a> - </li> - ); - } + <FormattedMessage + id='rhs_comment.permalink' + defaultMessage='Permalink' + /> + </a> + </li> + ); if (isOwner && !isSystemMessage) { dropdownContents.push( diff --git a/webapp/components/rhs_root_post.jsx b/webapp/components/rhs_root_post.jsx index 1aee008e7..cf8c3201a 100644 --- a/webapp/components/rhs_root_post.jsx +++ b/webapp/components/rhs_root_post.jsx @@ -91,24 +91,22 @@ export default class RhsRootPost extends React.Component { var dropdownContents = []; - if (!Utils.isMobile()) { - dropdownContents.push( - <li - key='rhs-root-permalink' - role='presentation' + dropdownContents.push( + <li + key='rhs-root-permalink' + role='presentation' + > + <a + href='#' + onClick={this.handlePermalink} > - <a - href='#' - onClick={this.handlePermalink} - > - <FormattedMessage - id='rhs_root.permalink' - defaultMessage='Permalink' - /> - </a> - </li> - ); - } + <FormattedMessage + id='rhs_root.permalink' + defaultMessage='Permalink' + /> + </a> + </li> + ); if (isOwner && !isSystemMessage) { dropdownContents.push( diff --git a/webapp/components/search_bar.jsx b/webapp/components/search_bar.jsx index c92adcd9b..970da7925 100644 --- a/webapp/components/search_bar.jsx +++ b/webapp/components/search_bar.jsx @@ -141,6 +141,8 @@ export default class SearchBar extends React.Component { handleSubmit(e) { e.preventDefault(); this.performSearch(this.state.searchTerm.trim()); + $(ReactDOM.findDOMNode(this.refs.search)).find('input').blur(); + this.clearFocus(); } render() { 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) { |