From 30bf72262ef3f85ad0ad24ea8e57a14415464af3 Mon Sep 17 00:00:00 2001 From: =Corey Hulen Date: Mon, 23 Nov 2015 12:54:28 -0800 Subject: fixing eslint --- web/react/components/channel_header.jsx | 2 ++ web/react/components/user_settings/user_settings_notifications.jsx | 2 ++ 2 files changed, 4 insertions(+) diff --git a/web/react/components/channel_header.jsx b/web/react/components/channel_header.jsx index d31477881..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.channel === 'true' && termKeys.indexOf('@channel') !== -1) { termKeys.splice(termKeys.indexOf('@channel'), 1); } diff --git a/web/react/components/user_settings/user_settings_notifications.jsx b/web/react/components/user_settings/user_settings_notifications.jsx index bba69a7d4..e025bf670 100644 --- a/web/react/components/user_settings/user_settings_notifications.jsx +++ b/web/react/components/user_settings/user_settings_notifications.jsx @@ -590,9 +590,11 @@ export default class NotificationsTab extends React.Component { if (this.state.mentionKey) { keys.push('@' + user.username); } + // if (this.state.allKey) { // keys.push('@all'); // } + if (this.state.channelKey) { keys.push('@channel'); } -- cgit v1.2.3-1-g7c22