diff options
author | Asaad Mahmood <Unknowngi@live.com> | 2015-10-02 22:26:28 +0500 |
---|---|---|
committer | Asaad Mahmood <Unknowngi@live.com> | 2015-10-02 22:26:28 +0500 |
commit | d8c5c4f7468bb07d8de904437726557c6fa9b436 (patch) | |
tree | c19af28e1ad6c2bf068bf64956461c25502f9bb3 /web/react/components/notify_counts.jsx | |
parent | 813792dd600f4e485d52cc1066a8c1297578432d (diff) | |
parent | 41069d83d2b6ad5cca599f75292027e13d5b10f7 (diff) | |
download | chat-d8c5c4f7468bb07d8de904437726557c6fa9b436.tar.gz chat-d8c5c4f7468bb07d8de904437726557c6fa9b436.tar.bz2 chat-d8c5c4f7468bb07d8de904437726557c6fa9b436.zip |
Merge branch 'master' of https://github.com/mattermost/platform into plt-375
Conflicts:
web/react/components/user_settings/user_settings_appearance.jsx
Diffstat (limited to 'web/react/components/notify_counts.jsx')
-rw-r--r-- | web/react/components/notify_counts.jsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/web/react/components/notify_counts.jsx b/web/react/components/notify_counts.jsx index 0b7c41b62..f34b4669f 100644 --- a/web/react/components/notify_counts.jsx +++ b/web/react/components/notify_counts.jsx @@ -15,7 +15,7 @@ function getCountsStateFromStores() { count += channel.total_msg_count - channelMember.msg_count; } else if (channelMember.mention_count > 0) { count += channelMember.mention_count; - } else if (channelMember.notify_level !== 'quiet' && channel.total_msg_count - channelMember.msg_count > 0) { + } else if (channelMember.notify_props.mark_unread !== 'mention' && channel.total_msg_count - channelMember.msg_count > 0) { count += 1; } }); |