diff options
| author | hmhealey <harrisonmhealey@gmail.com> | 2015-09-23 14:43:36 -0400 |
|---|---|---|
| committer | hmhealey <harrisonmhealey@gmail.com> | 2015-09-30 09:59:58 -0400 |
| commit | c4d50885a7d9c1716bc2cfe4e18a9065130bd045 (patch) | |
| tree | fbd2df9769434c11d0cab8be5e6312d4b3f601a8 /web | |
| parent | 9995c7ccfcb9ad0787439f476db55ac56fbecd04 (diff) | |
| download | chat-c4d50885a7d9c1716bc2cfe4e18a9065130bd045.tar.gz chat-c4d50885a7d9c1716bc2cfe4e18a9065130bd045.tar.bz2 chat-c4d50885a7d9c1716bc2cfe4e18a9065130bd045.zip | |
Implemented ChannelMember.MarkUnreadLevel so that it actually functions
Diffstat (limited to 'web')
| -rw-r--r-- | web/react/components/notify_counts.jsx | 2 | ||||
| -rw-r--r-- | web/react/components/sidebar.jsx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/web/react/components/notify_counts.jsx b/web/react/components/notify_counts.jsx index 0b7c41b62..3df661d70 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.mark_unread_level !== 'mention' && channel.total_msg_count - channelMember.msg_count > 0) { count += 1; } }); diff --git a/web/react/components/sidebar.jsx b/web/react/components/sidebar.jsx index bc66ee03c..5a4fb1169 100644 --- a/web/react/components/sidebar.jsx +++ b/web/react/components/sidebar.jsx @@ -334,7 +334,7 @@ export default class Sidebar extends React.Component { var unread = false; if (channelMember) { msgCount = channel.total_msg_count - channelMember.msg_count; - unread = (msgCount > 0 && channelMember.notify_level !== 'quiet') || channelMember.mention_count > 0; + unread = (msgCount > 0 && channelMember.mark_unread_level !== 'mention') || channelMember.mention_count > 0; } var titleClass = ''; |