IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove redundant mobile web search hint popover (#5233)

Browse Source
This commit is contained in:
Andrei Stanciu
2017-02-02 13:31:26 +02:00
committed by George Goldberg
parent 7563a8635c
commit 2ac4f36587
2 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
webapp/components/rhs_thread.jsx
View File

@@ -335,7 +335,7 @@ export default class RhsThread extends React.Component {
var currentId = UserStore.getCurrentId();
var searchForm;
if (currentId != null) {
searchForm = <SearchBox/>;
searchForm = <SearchBox isCommentsPage='true'/>;
}
let profile;

41
webapp/components/search_bar.jsx
View File

@@ -37,6 +37,7 @@ export default class SearchBar extends React.Component {
const state = this.getSearchTermStateFromStores();
state.focused = false;
state.isPristine = true;
this.state = state;
this.suggestionProviders = [new SearchChannelProvider(), new SearchUserProvider()];
@@ -114,7 +115,10 @@ export default class SearchBar extends React.Component {
performSearch(terms, isMentionSearch) {
if (terms.length) {
this.setState({isSearching: true});
this.setState({
isSearching: true,
isPristine: false
});
performSearch(
terms,
@@ -160,6 +164,25 @@ export default class SearchBar extends React.Component {
}
}
renderHintPopover(helpClass) {
if (!this.props.isCommentsPage && Utils.isMobile() && this.state.isPristine) {
return false;
}
return (
<Popover
id='searchbar-help-popup'
placement='bottom'
className={helpClass}
>
<FormattedHTMLMessage
id='search_bar.usage'
defaultMessage='<h4>Search Options</h4><ul><li><span>Use </span><b>"quotation marks"</b><span> to search for phrases</span></li><li><span>Use </span><b>from:</b><span> to find posts from specific users and </span><b>in:</b><span> to find posts in specific channels</span></li></ul>'
/>
</Popover>
);
}
render() {
const flagIcon = Constants.FLAG_ICON_SVG;
var isSearching = null;
@@ -279,16 +302,7 @@ export default class SearchBar extends React.Component {
type='search'
/>
{isSearching}
<Popover
id='searchbar-help-popup'
placement='bottom'
className={helpClass}
>
<FormattedHTMLMessage
id='search_bar.usage'
defaultMessage='<h4>Search Options</h4><ul><li><span>Use </span><b>"quotation marks"</b><span> to search for phrases</span></li><li><span>Use </span><b>from:</b><span> to find posts from specific users and </span><b>in:</b><span> to find posts in specific channels</span></li></ul>'
/>
</Popover>
{this.renderHintPopover(helpClass)}
</form>
{mentionBtn}
@@ -303,5 +317,6 @@ SearchBar.defaultProps = {
};
SearchBar.propTypes = {
showMentionFlagBtns: React.PropTypes.bool
};
showMentionFlagBtns: React.PropTypes.bool,
isCommentsPage: React.PropTypes.bool
};