IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1661 from mattermost/plt-1425

Browse Source 
PLT-1425 Remove @all from recent mentions
This commit is contained in:
Harrison Healey
2015-12-08 16:00:13 -05:00
parent 90791dd98e 4a0ae3c088
commit 9e3b2319f7
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
web/react/components/channel_header.jsx
View File

@@ -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);