diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2015-12-08 16:00:13 -0500 |
|---|---|---|
| committer | Harrison Healey <harrisonmhealey@gmail.com> | 2015-12-08 16:00:13 -0500 |
| commit | 9e3b2319f7eed52692f4ca811e3350177a97bbbd (patch) | |
| tree | 7e53f97688c9bebdd4babbe367defde227fc0885 /web/react | |
| parent | 90791dd98ea0f26439a13c1ec05a610514988b5c (diff) | |
| parent | 4a0ae3c088483d6d6457f496a7b2c03b6efd3961 (diff) | |
| download | chat-9e3b2319f7eed52692f4ca811e3350177a97bbbd.tar.gz chat-9e3b2319f7eed52692f4ca811e3350177a97bbbd.tar.bz2 chat-9e3b2319f7eed52692f4ca811e3350177a97bbbd.zip | |
Merge pull request #1661 from mattermost/plt-1425
PLT-1425 Remove @all from recent mentions
Diffstat (limited to 'web/react')
| -rw-r--r-- | web/react/components/channel_header.jsx | 6 |
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); |