Merge pull request #1311 from mattermost/plt-981

PLT-981 Only show * in tab title when a channel is marked unread

1 files changed, 4 insertions, 1 deletions

diff --git a/web/react/components/sidebar.jsx b/web/react/components/sidebar.jsx
index aab9919a4..8b5f7a381 100644
--- a/web/react/components/sidebar.jsx
+++ b/web/react/components/sidebar.jsx
@@ -20,6 +20,7 @@ const Utils = require('../utils/utils.jsx');
 const Constants = require('../utils/constants.jsx');
 const Preferences = Constants.Preferences;
 const TutorialSteps = Constants.TutorialSteps;
+const NotificationPrefs = Constants.NotificationPrefs;
 
 const Tooltip = ReactBootstrap.Tooltip;
 const OverlayTrigger = ReactBootstrap.OverlayTrigger;
@@ -76,6 +77,8 @@ export default class Sidebar extends React.Component {
             if (ch.type === 'D') {
                 chMentionCount = chUnreadCount;
                 chUnreadCount = 0;
+            } else if (chMember.notify_props && chMember.notify_props.mark_unread === NotificationPrefs.MENTION) {
+                chUnreadCount = 0;
             }
 
             channelUnreadCounts[ch.id] = {msgs: chUnreadCount, mentions: chMentionCount};
@@ -362,7 +365,7 @@ export default class Sidebar extends React.Component {
         var unread = false;
         if (channelMember) {
             msgCount = unreadCount.msgs + unreadCount.mentions;
-            unread = (msgCount > 0 && channelMember.notify_props.mark_unread !== 'mention') || channelMember.mention_count > 0;
+            unread = msgCount > 0 || channelMember.mention_count > 0;
         }
 
         if (unread) {