4 files changed, 35 insertions, 9 deletions

diff --git a/web/react/components/search_results_item.jsx b/web/react/components/search_results_item.jsx
index cd8359df5..f71abf971 100644
--- a/web/react/components/search_results_item.jsx
+++ b/web/react/components/search_results_item.jsx
@@ -8,11 +8,14 @@ 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) {
@@ -26,6 +29,12 @@ export default class SearchResultsItem extends React.Component {
         }
     }
 
+    handleFocusRHSClick(e) {
+        e.preventDefault();
+
+        EventHelpers.emitPostFocusRightHandSideEvent(this.props.post);
+    }
+
     render() {
         var channelName = '';
         var channel = ChannelStore.get(this.props.post.channel_id);
@@ -73,10 +82,21 @@ export default class SearchResultsItem extends React.Component {
                                     {'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
-                                onClick={this.handleClick}
                                 dangerouslySetInnerHTML={{__html: TextFormatting.formatText(this.props.post.message, formattingOptions)}}
                             />
                         </div>
diff --git a/web/react/components/suggestion/command_provider.jsx b/web/react/components/suggestion/command_provider.jsx
index a2a446de2..91d556bb9 100644
--- a/web/react/components/suggestion/command_provider.jsx
+++ b/web/react/components/suggestion/command_provider.jsx
@@ -39,7 +39,6 @@ export default class CommandProvider {
     handlePretextChanged(suggestionId, pretext) {
         if (pretext.startsWith('/')) {
             SuggestionStore.setMatchedPretext(suggestionId, pretext);
-            SuggestionStore.setCompleteOnSpace(suggestionId, false);
 
             AsyncClient.getSuggestedCommands(pretext, suggestionId, CommandSuggestion);
         }
diff --git a/web/react/components/suggestion/suggestion_box.jsx b/web/react/components/suggestion/suggestion_box.jsx
index ad8ad1e9e..57a33c24a 100644
--- a/web/react/components/suggestion/suggestion_box.jsx
+++ b/web/react/components/suggestion/suggestion_box.jsx
@@ -94,7 +94,7 @@ export default class SuggestionBox extends React.Component {
             } else if (e.which === KeyCodes.DOWN) {
                 EventHelpers.emitSelectNextSuggestion(this.suggestionId);
                 e.preventDefault();
-            } else if (e.which === KeyCodes.ENTER || e.which === KeyCodes.TAB || (e.which === KeyCodes.SPACE && SuggestionStore.shouldCompleteOnSpace(this.suggestionId))) {
+            } else if (e.which === KeyCodes.ENTER || e.which === KeyCodes.TAB) {
                 EventHelpers.emitCompleteWordSuggestion(this.suggestionId);
                 e.preventDefault();
             } else if (this.props.onKeyDown) {
diff --git a/web/react/components/team_signup_with_email.jsx b/web/react/components/team_signup_with_email.jsx
index 06d6e3934..4150a0013 100644
--- a/web/react/components/team_signup_with_email.jsx
+++ b/web/react/components/team_signup_with_email.jsx
@@ -14,18 +14,19 @@ export default class EmailSignUpPage extends React.Component {
     }
     handleSubmit(e) {
         e.preventDefault();
-        var team = {};
-        var state = {serverError: ''};
+        const team = {};
+        const state = {serverError: null};
+        let isValid = true;
 
         team.email = ReactDOM.findDOMNode(this.refs.email).value.trim().toLowerCase();
         if (!team.email || !Utils.isEmail(team.email)) {
             state.emailError = 'Please enter a valid email address';
-            state.inValid = true;
+            isValid = false;
         } else {
-            state.emailError = '';
+            state.emailError = null;
         }
 
-        if (state.inValid) {
+        if (!isValid) {
             this.setState(state);
             return;
         }
@@ -45,11 +46,16 @@ export default class EmailSignUpPage extends React.Component {
         );
     }
     render() {
-        var serverError = null;
+        let serverError = null;
         if (this.state.serverError) {
             serverError = <div className='form-group has-error'><label className='control-label'>{this.state.serverError}</label></div>;
         }
 
+        let emailError = null;
+        if (this.state.emailError) {
+            emailError = <div className='form-group has-error'><label className='control-label'>{this.state.emailError}</label></div>;
+        }
+
         return (
             <form
                 role='form'
@@ -65,6 +71,7 @@ export default class EmailSignUpPage extends React.Component {
                         maxLength='128'
                         spellCheck='false'
                     />
+                    {emailError}
                 </div>
                 <div className='form-group'>
                     <button