1 files changed, 59 insertions, 55 deletions

diff --git a/web/react/components/search_results_item.jsx b/web/react/components/search_results_item.jsx
index a8bd4db2c..f71abf971 100644
--- a/web/react/components/search_results_item.jsx
+++ b/web/react/components/search_results_item.jsx
@@ -1,54 +1,38 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var SearchStore = require('../stores/search_store.jsx');
-var ChannelStore = require('../stores/channel_store.jsx');
-var UserStore = require('../stores/user_store.jsx');
-var UserProfile = require('./user_profile.jsx');
-var utils = require('../utils/utils.jsx');
-var client = require('../utils/client.jsx');
-var AsyncClient = require('../utils/async_client.jsx');
-var AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
-var Constants = require('../utils/constants.jsx');
-var TextFormatting = require('../utils/text_formatting.jsx');
-var ActionTypes = Constants.ActionTypes;
+import ChannelStore from '../stores/channel_store.jsx';
+import UserStore from '../stores/user_store.jsx';
+import UserProfile from './user_profile.jsx';
+import * as EventHelpers from '../dispatcher/event_helpers.jsx';
+import * as utils from '../utils/utils.jsx';
+import * as TextFormatting from '../utils/text_formatting.jsx';
+
+import Constants from '../utils/constants.jsx';
 
 export default class SearchResultsItem extends React.Component {
     constructor(props) {
         super(props);
 
         this.handleClick = this.handleClick.bind(this);
+        this.handleFocusRHSClick = this.handleFocusRHSClick.bind(this);
     }
 
     handleClick(e) {
         e.preventDefault();
 
-        var self = this;
-
-        client.getPost(
-            this.props.post.channel_id,
-            this.props.post.id,
-            function success(data) {
-                AppDispatcher.handleServerAction({
-                    type: ActionTypes.RECIEVED_POST_SELECTED,
-                    post_list: data,
-                    from_search: SearchStore.getSearchTerm()
-                });
+        EventHelpers.emitPostFocusEvent(this.props.post.id);
 
-                AppDispatcher.handleServerAction({
-                    type: ActionTypes.RECIEVED_SEARCH,
-                    results: null,
-                    is_mention_search: self.props.isMentionSearch
-                });
-            },
-            function success(err) {
-                AsyncClient.dispatchError(err, 'getPost');
-            }
-        );
+        if ($(window).width() < 768) {
+            $('.sidebar--right').removeClass('move--left');
+            $('.inner__wrap').removeClass('move--left');
+        }
+    }
 
-        var postChannel = ChannelStore.get(this.props.post.channel_id);
+    handleFocusRHSClick(e) {
+        e.preventDefault();
 
-        utils.switchChannel(postChannel);
+        EventHelpers.emitPostFocusRightHandSideEvent(this.props.post);
     }
 
     render() {
@@ -71,32 +55,52 @@ export default class SearchResultsItem extends React.Component {
         return (
             <div
                 className='search-item-container post'
-                onClick={this.handleClick}
             >
                 <div className='search-channel__name'>{channelName}</div>
-                <div className='post-profile-img__container'>
-                    <img
-                        className='post-profile-img'
-                        src={'/api/v1/users/' + this.props.post.user_id + '/image?time=' + timestamp + '&' + utils.getSessionIndex()}
-                        height='36'
-                        width='36'
-                    />
-                </div>
                 <div className='post__content'>
-                    <ul className='post-header'>
-                        <li className='post-header-col'><strong><UserProfile userId={this.props.post.user_id} /></strong></li>
-                        <li className='post-header-col'>
-                            <time className='search-item-time'>
-                                {utils.displayDate(this.props.post.create_at) + ' ' + utils.displayTime(this.props.post.create_at)}
-                            </time>
-                        </li>
-                    </ul>
-                    <div className='search-item-snippet'>
-                        <span
-                            onClick={this.handleClick}
-                            dangerouslySetInnerHTML={{__html: TextFormatting.formatText(this.props.post.message, formattingOptions)}}
+                    <div className='post__img'>
+                        <img
+                            src={'/api/v1/users/' + this.props.post.user_id + '/image?time=' + timestamp + '&' + utils.getSessionIndex()}
+                            height='36'
+                            width='36'
                         />
                     </div>
+                    <div>
+                        <ul className='post__header'>
+                            <li className='col__name'><strong><UserProfile userId={this.props.post.user_id} /></strong></li>
+                            <li className='col'>
+                                <time className='search-item-time'>
+                                    {utils.displayDate(this.props.post.create_at) + ' ' + utils.displayTime(this.props.post.create_at)}
+                                </time>
+                            </li>
+                            <li>
+                                <a
+                                    href='#'
+                                    className='search-item__jump'
+                                    onClick={this.handleClick}
+                                >
+                                    {'Jump'}
+                                </a>
+                            </li>
+                            <li>
+                                <a
+                                    href='#'
+                                    className='comment-icon__container search-item__comment'
+                                    onClick={this.handleFocusRHSClick}
+                                >
+                                    <span
+                                        className='comment-icon'
+                                        dangerouslySetInnerHTML={{__html: Constants.COMMENT_ICON}}
+                                    />
+                                </a>
+                            </li>
+                        </ul>
+                        <div className='search-item-snippet'>
+                            <span
+                                dangerouslySetInnerHTML={{__html: TextFormatting.formatText(this.props.post.message, formattingOptions)}}
+                            />
+                        </div>
+                    </div>
                 </div>
             </div>
         );