summaryrefslogtreecommitdiffstats
path: root/web/react/components/channel_header.jsx
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2015-11-24 09:02:49 -0500
committerChristopher Speller <crspeller@gmail.com>2015-11-24 09:02:49 -0500
commit99cbbf45dcbfae93b86703c1ba24c5e763932f39 (patch)
treedc769a58ab30aaa08be7b60ae972631294ea3448 /web/react/components/channel_header.jsx
parent2090f6ad572e68ca56f1df44884fd02c5e92ad23 (diff)
parent30bf72262ef3f85ad0ad24ea8e57a14415464af3 (diff)
downloadchat-99cbbf45dcbfae93b86703c1ba24c5e763932f39.tar.gz
chat-99cbbf45dcbfae93b86703c1ba24c5e763932f39.tar.bz2
chat-99cbbf45dcbfae93b86703c1ba24c5e763932f39.zip
Merge pull request #1502 from mattermost/disable-all
Disabling the all mention
Diffstat (limited to 'web/react/components/channel_header.jsx')
-rw-r--r--web/react/components/channel_header.jsx8
1 files changed, 5 insertions, 3 deletions
diff --git a/web/react/components/channel_header.jsx b/web/react/components/channel_header.jsx
index 6e12c7c14..08c4a48ea 100644
--- a/web/react/components/channel_header.jsx
+++ b/web/react/components/channel_header.jsx
@@ -101,9 +101,11 @@ export default class ChannelHeader extends React.Component {
let terms = '';
if (user.notify_props && user.notify_props.mention_keys) {
const termKeys = UserStore.getCurrentMentionKeys();
- if (user.notify_props.all === 'true' && termKeys.indexOf('@all') !== -1) {
- termKeys.splice(termKeys.indexOf('@all'), 1);
- }
+
+ // if (user.notify_props.all === 'true' && termKeys.indexOf('@all') !== -1) {
+ // termKeys.splice(termKeys.indexOf('@all'), 1);
+ // }
+
if (user.notify_props.channel === 'true' && termKeys.indexOf('@channel') !== -1) {
termKeys.splice(termKeys.indexOf('@channel'), 1);
}