diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-11-24 09:02:49 -0500 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-11-24 09:02:49 -0500 |
| commit | 99cbbf45dcbfae93b86703c1ba24c5e763932f39 (patch) | |
| tree | dc769a58ab30aaa08be7b60ae972631294ea3448 /web | |
| parent | 2090f6ad572e68ca56f1df44884fd02c5e92ad23 (diff) | |
| parent | 30bf72262ef3f85ad0ad24ea8e57a14415464af3 (diff) | |
| download | chat-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')
| -rw-r--r-- | web/react/components/channel_header.jsx | 8 | ||||
| -rw-r--r-- | web/react/components/mention_list.jsx | 12 | ||||
| -rw-r--r-- | web/react/components/user_settings/user_settings_notifications.jsx | 10 | ||||
| -rw-r--r-- | web/react/utils/constants.jsx | 3 |
4 files changed, 19 insertions, 14 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); } diff --git a/web/react/components/mention_list.jsx b/web/react/components/mention_list.jsx index d1b27cf99..297d5c719 100644 --- a/web/react/components/mention_list.jsx +++ b/web/react/components/mention_list.jsx @@ -183,12 +183,12 @@ export default class MentionList extends React.Component { } } - var all = {}; - all.username = 'all'; - all.nickname = ''; - all.secondary_text = 'Notifies everyone in the team'; - all.id = 'allmention'; - users.push(all); + // var all = {}; + // all.username = 'all'; + // all.nickname = ''; + // all.secondary_text = 'Notifies everyone in the team'; + // all.id = 'allmention'; + // users.push(all); var channel = {}; channel.username = 'channel'; diff --git a/web/react/components/user_settings/user_settings_notifications.jsx b/web/react/components/user_settings/user_settings_notifications.jsx index e36aed395..e025bf670 100644 --- a/web/react/components/user_settings/user_settings_notifications.jsx +++ b/web/react/components/user_settings/user_settings_notifications.jsx @@ -512,7 +512,7 @@ export default class NotificationsTab extends React.Component { }.bind(this); inputs.push( <div key='userNotificationAllOption'> - <div className='checkbox'> + <div className='checkbox hidden'> <label> <input type='checkbox' @@ -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.allKey) { + // keys.push('@all'); + // } + if (this.state.channelKey) { keys.push('@channel'); } diff --git a/web/react/utils/constants.jsx b/web/react/utils/constants.jsx index 6281813e9..372e15556 100644 --- a/web/react/utils/constants.jsx +++ b/web/react/utils/constants.jsx @@ -68,7 +68,8 @@ export default { TYPING: 'typing' }, - SPECIAL_MENTIONS: ['all', 'channel'], + //SPECIAL_MENTIONS: ['all', 'channel'], + SPECIAL_MENTIONS: ['channel'], CHARACTER_LIMIT: 4000, IMAGE_TYPES: ['jpg', 'gif', 'bmp', 'png', 'jpeg'], AUDIO_TYPES: ['mp3', 'wav', 'wma', 'm4a', 'flac', 'aac'], |