diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-10-02 08:36:56 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-10-02 08:36:56 -0700 |
| commit | b2052de746f8e5f4ca600142fd43b64ceb6c8b84 (patch) | |
| tree | 99474e75e399fc530a73cfb3cdc10d74bcbc0b01 /web/react/components/notify_counts.jsx | |
| parent | 9d688821aa8bb8d766793aeaec6920f9985a30a3 (diff) | |
| parent | c427e9c9d6fbd68662fdfbbe733af4b34ae69269 (diff) | |
| download | chat-b2052de746f8e5f4ca600142fd43b64ceb6c8b84.tar.gz chat-b2052de746f8e5f4ca600142fd43b64ceb6c8b84.tar.bz2 chat-b2052de746f8e5f4ca600142fd43b64ceb6c8b84.zip | |
Merge branch 'master' into PLT-462
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; } }); |