From bf555fae14db647d0f1711326126bf94194a0151 Mon Sep 17 00:00:00 2001
From: Christopher Speller <crspeller@gmail.com>
Date: Mon, 26 Oct 2015 15:16:14 -0400
Subject: Refactoring post_store into post_store and search_store

---
 web/react/components/mention_list.jsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'web/react/components/mention_list.jsx')

diff --git a/web/react/components/mention_list.jsx b/web/react/components/mention_list.jsx
index 8c1da942d..cb7f71f15 100644
--- a/web/react/components/mention_list.jsx
+++ b/web/react/components/mention_list.jsx
@@ -2,7 +2,7 @@
 // See License.txt for license information.
 
 var UserStore = require('../stores/user_store.jsx');
-var PostStore = require('../stores/post_store.jsx');
+var SearchStore = require('../stores/search_store.jsx');
 var AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
 var Mention = require('./mention.jsx');
 
@@ -66,7 +66,7 @@ export default class MentionList extends React.Component {
         }
     }
     componentDidMount() {
-        PostStore.addMentionDataChangeListener(this.onListenerChange);
+        SearchStore.addMentionDataChangeListener(this.onListenerChange);
 
         $('.post-right__scroll').scroll(this.onScroll);
 
@@ -74,7 +74,7 @@ export default class MentionList extends React.Component {
         $(document).click(this.onClick);
     }
     componentWillUnmount() {
-        PostStore.removeMentionDataChangeListener(this.onListenerChange);
+        SearchStore.removeMentionDataChangeListener(this.onListenerChange);
         $('body').off('keydown.mentionlist', '#' + this.props.id);
     }
 
-- 
cgit v1.2.3-1-g7c22


From ae3e600c7d68a9fdf877f171143f054be980f6e6 Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Mon, 26 Oct 2015 17:00:06 -0700
Subject: Fixed issue with missing help text for @all and @channel in mention
 list

---
 web/react/components/mention_list.jsx | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'web/react/components/mention_list.jsx')

diff --git a/web/react/components/mention_list.jsx b/web/react/components/mention_list.jsx
index 8c1da942d..60cae55d6 100644
--- a/web/react/components/mention_list.jsx
+++ b/web/react/components/mention_list.jsx
@@ -217,12 +217,17 @@ export default class MentionList extends React.Component {
                 if (this.state.selectedMention === index) {
                     isFocused = 'mentions-focus';
                 }
+
+                if (!users[i].secondary_text) {
+                    users[i].secondary_text = Utils.getFullName(users[i]);
+                }
+
                 mentions[index] = (
                     <Mention
                         key={'mention_key_' + index}
                         ref={'mention' + index}
                         username={users[i].username}
-                        secondary_text={Utils.getFullName(users[i])}
+                        secondary_text={users[i].secondary_text}
                         id={users[i].id}
                         listId={index}
                         isFocused={isFocused}
-- 
cgit v1.2.3-1-g7c22