summaryrefslogtreecommitdiffstats
path: root/web/react/components/navbar.jsx
diff options
context:
space:
mode:
authorCorey Hulen <corey@hulen.com>2015-07-22 10:44:06 -0800
committerCorey Hulen <corey@hulen.com>2015-07-22 10:44:06 -0800
commitc6a82b8d3f082537a025c860c6539104d1be1e64 (patch)
tree5a03ea1edb455af308014206f5977adb45f5ebde /web/react/components/navbar.jsx
parent3fca3b93f5bed0f695c098b6c7d751e279b31a34 (diff)
parent8b158bf2cfd5f06ac409e672645f5739f1edeaa9 (diff)
downloadchat-c6a82b8d3f082537a025c860c6539104d1be1e64.tar.gz
chat-c6a82b8d3f082537a025c860c6539104d1be1e64.tar.bz2
chat-c6a82b8d3f082537a025c860c6539104d1be1e64.zip
Merge pull request #235 from rgarmsen2295/mm-1596
MM-1596 While in mobile mode notifications are no longer counted for channels set to 'quiet mode' that are not direct mentions
Diffstat (limited to 'web/react/components/navbar.jsx')
-rw-r--r--web/react/components/navbar.jsx2
1 files changed, 1 insertions, 1 deletions
diff --git a/web/react/components/navbar.jsx b/web/react/components/navbar.jsx
index 34c65c34f..500fabb0e 100644
--- a/web/react/components/navbar.jsx
+++ b/web/react/components/navbar.jsx
@@ -28,7 +28,7 @@ function getCountsStateFromStores() {
} else {
if (channelMember.mention_count > 0) {
count += channelMember.mention_count;
- } else if (channel.total_msg_count - channelMember.msg_count > 0) {
+ } else if (channelMember.notify_level !== "quiet" && channel.total_msg_count - channelMember.msg_count > 0) {
count += 1;
}
}