diff options
| author | Christopher Speller <crspeller@gmail.com> | 2017-01-12 19:59:37 -0500 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2017-01-12 19:59:37 -0500 |
| commit | 8fb66c2b834ee4e0669de173e5ddfebd56c34d58 (patch) | |
| tree | 9e8e66772d44c4f9010a48c8e0afed70421238b1 /webapp/components/notify_counts.jsx | |
| parent | 4208e42ba9df02b9c4bd7081179922c21206d83d (diff) | |
| parent | aafb8be87c79c60df7534b3b69f967c6301b157e (diff) | |
| download | chat-8fb66c2b834ee4e0669de173e5ddfebd56c34d58.tar.gz chat-8fb66c2b834ee4e0669de173e5ddfebd56c34d58.tar.bz2 chat-8fb66c2b834ee4e0669de173e5ddfebd56c34d58.zip | |
Merge branch 'release-3.6'
Diffstat (limited to 'webapp/components/notify_counts.jsx')
| -rw-r--r-- | webapp/components/notify_counts.jsx | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/webapp/components/notify_counts.jsx b/webapp/components/notify_counts.jsx index d49925780..55ede2d90 100644 --- a/webapp/components/notify_counts.jsx +++ b/webapp/components/notify_counts.jsx @@ -13,7 +13,7 @@ function getCountsStateFromStores() { teamMembers.forEach((member) => { if (member.team_id !== TeamStore.getCurrentId()) { - count += ((member.msg_count || 0) + (member.mention_count || 0)); + count += (member.mention_count || 0); } }); @@ -27,8 +27,6 @@ function getCountsStateFromStores() { count += channel.total_msg_count - channelMember.msg_count; } else if (channelMember.mention_count > 0) { count += channelMember.mention_count; - } else if (channelMember.notify_props.mark_unread !== 'mention' && channel.total_msg_count - channelMember.msg_count > 0) { - count += 1; } }); |