From 15cc7ccafc745be683cbe9c98409187ecb6a1784 Mon Sep 17 00:00:00 2001
From: =Corey Hulen <corey@hulen.com>
Date: Thu, 10 Dec 2015 14:37:15 -0800
Subject: PLT-1472 Adding back button to search click through

---
 web/react/components/search_results_item.jsx |  3 +--
 web/react/dispatcher/event_helpers.jsx       | 12 ++++++------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/web/react/components/search_results_item.jsx b/web/react/components/search_results_item.jsx
index f71abf971..f235cac0a 100644
--- a/web/react/components/search_results_item.jsx
+++ b/web/react/components/search_results_item.jsx
@@ -31,8 +31,7 @@ export default class SearchResultsItem extends React.Component {
 
     handleFocusRHSClick(e) {
         e.preventDefault();
-
-        EventHelpers.emitPostFocusRightHandSideEvent(this.props.post);
+        EventHelpers.emitPostFocusRightHandSideFromSearch(this.props.post, this.props.isMentionSearch);
     }
 
     render() {
diff --git a/web/react/dispatcher/event_helpers.jsx b/web/react/dispatcher/event_helpers.jsx
index bc1132765..862ff3594 100644
--- a/web/react/dispatcher/event_helpers.jsx
+++ b/web/react/dispatcher/event_helpers.jsx
@@ -4,6 +4,7 @@
 import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
 import ChannelStore from '../stores/channel_store.jsx';
 import PostStore from '../stores/post_store.jsx';
+import SearchStore from '../stores/search_store.jsx';
 import Constants from '../utils/constants.jsx';
 const ActionTypes = Constants.ActionTypes;
 import * as AsyncClient from '../utils/async_client.jsx';
@@ -39,28 +40,27 @@ export function emitPostFocusEvent(postId) {
     );
 }
 
-export function emitPostFocusRightHandSideEvent(post) {
+export function emitPostFocusRightHandSideFromSearch(post, isMentionSearch) {
     Client.getPost(
         post.channel_id,
         post.id,
         (data) => {
             AppDispatcher.handleServerAction({
                 type: ActionTypes.RECIEVED_POST_SELECTED,
-                post_list: data
+                post_list: data,
+                from_search: SearchStore.getSearchTerm()
             });
 
             AppDispatcher.handleServerAction({
                 type: ActionTypes.RECIEVED_SEARCH,
-                results: null
+                results: null,
+                is_mention_search: isMentionSearch
             });
         },
         (err) => {
             AsyncClient.dispatchError(err, 'getPost');
         }
     );
-
-    var postChannel = ChannelStore.get(post.channel_id);
-    Utils.switchChannel(postChannel);
 }
 
 export function emitLoadMorePostsEvent() {
-- 
cgit v1.2.3-1-g7c22