diff options
author | Christopher Speller <crspeller@gmail.com> | 2017-04-24 13:10:34 -0400 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2017-04-24 13:10:34 -0400 |
commit | 7f68a60f8c228d5604e0566bf84cabb145d16c37 (patch) | |
tree | 65f1c89e4c57c5d46108b93c257398c76d732c88 /webapp | |
parent | 134f78e630589531df212d3cb2bb748aa9bf68f4 (diff) | |
download | chat-7f68a60f8c228d5604e0566bf84cabb145d16c37.tar.gz chat-7f68a60f8c228d5604e0566bf84cabb145d16c37.tar.bz2 chat-7f68a60f8c228d5604e0566bf84cabb145d16c37.zip |
Fixing double enter in channel switcher (#6208)
Diffstat (limited to 'webapp')
-rw-r--r-- | webapp/components/search_bar.jsx | 6 | ||||
-rw-r--r-- | webapp/components/suggestion/suggestion_box.jsx | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/webapp/components/search_bar.jsx b/webapp/components/search_bar.jsx index 527f965c7..23f7d1762 100644 --- a/webapp/components/search_bar.jsx +++ b/webapp/components/search_bar.jsx @@ -36,6 +36,7 @@ export default class SearchBar extends React.Component { this.handleSubmit = this.handleSubmit.bind(this); this.searchMentions = this.searchMentions.bind(this); this.getFlagged = this.getFlagged.bind(this); + this.handleKeyDown = this.handleKeyDown.bind(this); const state = this.getSearchTermStateFromStores(); state.focused = false; @@ -107,6 +108,10 @@ export default class SearchBar extends React.Component { }); } + handleKeyDown() { + // This is just to prevent a JS error + } + handleChange(e) { var term = e.target.value; SearchStore.storeSearchTerm(term); @@ -320,6 +325,7 @@ export default class SearchBar extends React.Component { onFocus={this.handleUserFocus} onBlur={this.handleUserBlur} onChange={this.handleChange} + onKeyDown={this.handleKeyDown} listComponent={SearchSuggestionList} providers={this.suggestionProviders} type='search' diff --git a/webapp/components/suggestion/suggestion_box.jsx b/webapp/components/suggestion/suggestion_box.jsx index 6126a16a0..2c358b693 100644 --- a/webapp/components/suggestion/suggestion_box.jsx +++ b/webapp/components/suggestion/suggestion_box.jsx @@ -172,6 +172,7 @@ export default class SuggestionBox extends React.Component { e.preventDefault(); } else if (e.which === KeyCodes.ENTER || e.which === KeyCodes.TAB) { GlobalActions.emitCompleteWordSuggestion(this.suggestionId); + this.props.onKeyDown(e); e.preventDefault(); } else if (e.which === KeyCodes.ESCAPE) { GlobalActions.emitClearSuggestions(this.suggestionId); |