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

Merge pull request #1431 from hmhealey/plt1149

Browse Source 
PLT-1149 Fixed some console errors related to the search autocomplete
This commit is contained in:
Joram Wilander
2015-11-14 11:48:30 -05:00
parent f0b1adf6cf c31e811351
commit 11f0054bba
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
web/react/components/search_autocomplete.jsx
View File

@@ -46,7 +46,7 @@ export default class SearchAutocomplete extends React.Component {
componentDidUpdate(prevProps, prevState) {
const content = $(ReactDOM.findDOMNode(this.refs.searchPopover)).find('.popover-content');
if (this.state.show) {
if (this.state.show && this.state.suggestions.length > 0) {
if (!prevState.show) {
content.perfectScrollbar();
content.css('max-height', $(window).height() - 200);
@@ -143,10 +143,12 @@ export default class SearchAutocomplete extends React.Component {
}
getSelection() {
if (this.state.mode === 'channels') {
return this.state.suggestions[this.state.selection].name;
} else if (this.state.mode === 'users') {
return this.state.suggestions[this.state.selection].username;
if (this.state.suggestions.length > 0) {
if (this.state.mode === 'channels') {
return this.state.suggestions[this.state.selection].name;
} else if (this.state.mode === 'users') {
return this.state.suggestions[this.state.selection].username;
}
}
return '';