1 files changed, 11 insertions, 14 deletions

diff --git a/web/react/components/search_bar.jsx b/web/react/components/search_bar.jsx
index e1d36ad7d..90865475b 100644
--- a/web/react/components/search_bar.jsx
+++ b/web/react/components/search_bar.jsx
@@ -3,7 +3,7 @@
 
 var client = require('../utils/client.jsx');
 var AsyncClient = require('../utils/async_client.jsx');
-var PostStore = require('../stores/post_store.jsx');
+var SearchStore = require('../stores/search_store.jsx');
 var AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
 var utils = require('../utils/utils.jsx');
 var Constants = require('../utils/constants.jsx');
@@ -30,17 +30,17 @@ export default class SearchBar extends React.Component {
         this.state = state;
     }
     getSearchTermStateFromStores() {
-        var term = PostStore.getSearchTerm() || '';
+        var term = SearchStore.getSearchTerm() || '';
         return {
             searchTerm: term
         };
     }
     componentDidMount() {
-        PostStore.addSearchTermChangeListener(this.onListenerChange);
+        SearchStore.addSearchTermChangeListener(this.onListenerChange);
         this.mounted = true;
     }
     componentWillUnmount() {
-        PostStore.removeSearchTermChangeListener(this.onListenerChange);
+        SearchStore.removeSearchTermChangeListener(this.onListenerChange);
         this.mounted = false;
     }
     onListenerChange(doSearch, isMentionSearch) {
@@ -84,20 +84,16 @@ export default class SearchBar extends React.Component {
     }
     handleUserInput(e) {
         var term = e.target.value;
-        PostStore.storeSearchTerm(term);
-        PostStore.emitSearchTermChange(false);
+        SearchStore.storeSearchTerm(term);
+        SearchStore.emitSearchTermChange(false);
         this.setState({searchTerm: term});
 
         this.refs.autocomplete.handleInputChange(e.target, term);
     }
-    handleMouseInput(e) {
-        e.preventDefault();
-    }
     handleUserBlur() {
         this.setState({focused: false});
     }
-    handleUserFocus(e) {
-        e.target.select();
+    handleUserFocus() {
         $('.search-bar__container').addClass('focused');
 
         this.setState({focused: true});
@@ -105,6 +101,7 @@ export default class SearchBar extends React.Component {
     performSearch(terms, isMentionSearch) {
         if (terms.length) {
             this.setState({isSearching: true});
+
             client.search(
                 terms,
                 (data) => {
@@ -143,8 +140,8 @@ export default class SearchBar extends React.Component {
         textbox.value = text;
         utils.setCaretPosition(textbox, preText.length + word.length);
 
-        PostStore.storeSearchTerm(text);
-        PostStore.emitSearchTermChange(false);
+        SearchStore.storeSearchTerm(text);
+        SearchStore.emitSearchTermChange(false);
         this.setState({searchTerm: text});
     }
 
@@ -178,6 +175,7 @@ export default class SearchBar extends React.Component {
                     className='search__form relative-div'
                     onSubmit={this.handleSubmit}
                     style={{overflow: 'visible'}}
+                    autoComplete='off'
                 >
                     <span className='glyphicon glyphicon-search sidebar__search-icon' />
                     <input
@@ -190,7 +188,6 @@ export default class SearchBar extends React.Component {
                         onBlur={this.handleUserBlur}
                         onChange={this.handleUserInput}
                         onKeyDown={this.handleKeyDown}
-                        onMouseUp={this.handleMouseInput}
                     />
                     {isSearching}
                     <SearchAutocomplete