summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCorey Hulen <corey@hulen.com>2015-08-23 20:38:43 -0700
committerCorey Hulen <corey@hulen.com>2015-08-23 20:38:43 -0700
commit9843bcc0bf25733a8f7a7315a7e24a1dba1a22db (patch)
tree9bdc9ed0cb1398fc585de518aa679134a8087d9c
parentb73f43d994cbc8b965be126f8e262e258ab0095a (diff)
parent8230b49014481154af1c6c9c41944010f0fbec50 (diff)
downloadchat-9843bcc0bf25733a8f7a7315a7e24a1dba1a22db.tar.gz
chat-9843bcc0bf25733a8f7a7315a7e24a1dba1a22db.tar.bz2
chat-9843bcc0bf25733a8f7a7315a7e24a1dba1a22db.zip
Merge pull request #440 from nickago/MM-1803
MM-1803 Remove search term after the RHS is closed
-rw-r--r--web/react/components/search_bar.jsx7
-rw-r--r--web/react/components/search_results.jsx7
2 files changed, 14 insertions, 0 deletions
diff --git a/web/react/components/search_bar.jsx b/web/react/components/search_bar.jsx
index e39cf5d46..b11b39e9e 100644
--- a/web/react/components/search_bar.jsx
+++ b/web/react/components/search_bar.jsx
@@ -48,6 +48,13 @@ module.exports = React.createClass({
});
AppDispatcher.handleServerAction({
+ type: ActionTypes.RECIEVED_SEARCH_TERM,
+ term: null,
+ do_search: false,
+ is_mention_search: false
+ });
+
+ AppDispatcher.handleServerAction({
type: ActionTypes.RECIEVED_POST_SELECTED,
results: null
});
diff --git a/web/react/components/search_results.jsx b/web/react/components/search_results.jsx
index 643ad112b..b1efd7685 100644
--- a/web/react/components/search_results.jsx
+++ b/web/react/components/search_results.jsx
@@ -24,6 +24,13 @@ var RhsHeaderSearch = React.createClass({
});
AppDispatcher.handleServerAction({
+ type: ActionTypes.RECIEVED_SEARCH_TERM,
+ term: null,
+ do_search: false,
+ is_mention_search: false
+ });
+
+ AppDispatcher.handleServerAction({
type: ActionTypes.RECIEVED_POST_SELECTED,
results: null
});