summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoramWilander <jwawilander@gmail.com>2015-12-08 15:02:41 -0500
committerJoramWilander <jwawilander@gmail.com>2015-12-08 15:02:41 -0500
commit4a0ae3c088483d6d6457f496a7b2c03b6efd3961 (patch)
treee65f4321ea475a4d3a1acd9623fbdca18dd8a2a7
parent14775d4f148848143dab07d59cca899303d10966 (diff)
downloadchat-4a0ae3c088483d6d6457f496a7b2c03b6efd3961.tar.gz
chat-4a0ae3c088483d6d6457f496a7b2c03b6efd3961.tar.bz2
chat-4a0ae3c088483d6d6457f496a7b2c03b6efd3961.zip
Remove @all from recent mentions
-rw-r--r--web/react/components/channel_header.jsx6
1 files changed, 3 insertions, 3 deletions
diff --git a/web/react/components/channel_header.jsx b/web/react/components/channel_header.jsx
index d5a46721e..59ceb038e 100644
--- a/web/react/components/channel_header.jsx
+++ b/web/react/components/channel_header.jsx
@@ -101,9 +101,9 @@ export default class ChannelHeader extends React.Component {
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);