summaryrefslogtreecommitdiffstats
path: root/web/react/components
diff options
context:
space:
mode:
Diffstat (limited to 'web/react/components')
-rw-r--r--web/react/components/channel_header.jsx9
1 files changed, 8 insertions, 1 deletions
diff --git a/web/react/components/channel_header.jsx b/web/react/components/channel_header.jsx
index 76dbe370b..0dac593b1 100644
--- a/web/react/components/channel_header.jsx
+++ b/web/react/components/channel_header.jsx
@@ -125,7 +125,14 @@ module.exports = React.createClass({
var terms = "";
if (user.notify_props && user.notify_props.mention_keys) {
- terms = UserStore.getCurrentMentionKeys().join(' ');
+ var 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);
+ }
+ terms = termKeys.join(' ');
}
AppDispatcher.handleServerAction({