Merge pull request #3680 from t3chguy/t3chguy/escape_cancel_search_fo…

…cus_composer Cancel quicksearch on ESC
element-hq · Apr 21, 2017 · 9c27075 · 9c27075
2 parents ddd12ed + 52a1192
commit 9c27075
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/components/structures/SearchBox.js b/src/components/structures/SearchBox.js
@@ -100,6 +100,10 @@ module.exports = React.createClass({
         }
 
         switch (ev.keyCode) {
+            case KeyCode.ESCAPE:
+                this._clearSearch();
+                dis.dispatch({action: 'focus_composer'});
+                break;
             case KeyCode.KEY_K:
                 if (ctrlCmdOnly) {
                     if (this.refs.search) {