diff options
author | Joram Wilander <jwawilander@gmail.com> | 2015-07-29 11:48:07 -0400 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2015-07-29 11:48:07 -0400 |
commit | 27dbcd8767426a60699d2acbeeb9b8a825d5b728 (patch) | |
tree | f2cf511b15990bd01bfde349016388af39f8d340 /web/react/components/search_bar.jsx | |
parent | bf1ef5bbfe6801f7c58bb29dacaaae378b9c5efc (diff) | |
parent | 1e0abf74a3cfea6a540e922abf6e038018160fc4 (diff) | |
download | chat-27dbcd8767426a60699d2acbeeb9b8a825d5b728.tar.gz chat-27dbcd8767426a60699d2acbeeb9b8a825d5b728.tar.bz2 chat-27dbcd8767426a60699d2acbeeb9b8a825d5b728.zip |
Merge pull request #275 from asaadmahmoodspin/mm-1762
MM-1762 - Search improvements with some other minor Ui changes
Diffstat (limited to 'web/react/components/search_bar.jsx')
-rw-r--r-- | web/react/components/search_bar.jsx | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/web/react/components/search_bar.jsx b/web/react/components/search_bar.jsx index f21f0cd58..e39cf5d46 100644 --- a/web/react/components/search_bar.jsx +++ b/web/react/components/search_bar.jsx @@ -36,6 +36,9 @@ module.exports = React.createClass({ } } }, + clearFocus: function(e) { + $('.search-bar__container').removeClass('focused'); + }, handleClose: function(e) { e.preventDefault(); @@ -57,6 +60,7 @@ module.exports = React.createClass({ }, handleUserFocus: function(e) { e.target.select(); + $('.search-bar__container').addClass('focused'); }, performSearch: function(terms, isMentionSearch) { if (terms.length) { @@ -92,13 +96,14 @@ module.exports = React.createClass({ render: function() { return ( <div> - <div className="sidebar__collapse" onClick={this.handleClose}>Cancel</div> - <span className="glyphicon glyphicon-search sidebar__search-icon"></span> + <div className="sidebar__collapse" onClick={this.handleClose}><span className="fa fa-angle-left"></span></div> + <span onClick={this.clearFocus} className="search__clear">Cancel</span> <form role="form" className="search__form relative-div" onSubmit={this.handleSubmit}> + <span className="glyphicon glyphicon-search sidebar__search-icon"></span> <input type="text" ref="search" - className="form-control search-bar-box" + className="form-control search-bar" placeholder="Search" value={this.state.search_term} onFocus={this.handleUserFocus} |