summaryrefslogtreecommitdiffstats
path: root/web/react
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2015-09-10 08:24:50 -0400
committerChristopher Speller <crspeller@gmail.com>2015-09-10 08:24:50 -0400
commite82070c2ce8fe2bfcce13037870675c1cb8a79ab (patch)
tree5929bc7a1460de147f35e04ad6d5d6d1a91b91e0 /web/react
parent5ea3fb0f150d9474d5125f5aa19f4bf5e404ba19 (diff)
parent2e5a58a11eed385092129775f1a0dd5a57e0c2ce (diff)
downloadchat-e82070c2ce8fe2bfcce13037870675c1cb8a79ab.tar.gz
chat-e82070c2ce8fe2bfcce13037870675c1cb8a79ab.tar.bz2
chat-e82070c2ce8fe2bfcce13037870675c1cb8a79ab.zip
Merge pull request #635 from hmhealey/plt159
PLT-159/MM-2074 Changed unread posts indicator to not be shown for the current channel
Diffstat (limited to 'web/react')
-rw-r--r--web/react/components/sidebar.jsx8
1 files changed, 5 insertions, 3 deletions
diff --git a/web/react/components/sidebar.jsx b/web/react/components/sidebar.jsx
index 983260187..ad934d271 100644
--- a/web/react/components/sidebar.jsx
+++ b/web/react/components/sidebar.jsx
@@ -315,10 +315,12 @@ export default class Sidebar extends React.Component {
if (unread) {
titleClass = 'unread-title';
- if (!this.firstUnreadChannel) {
- this.firstUnreadChannel = channel.name;
+ if (channel.id !== activeId) {
+ if (!this.firstUnreadChannel) {
+ this.firstUnreadChannel = channel.name;
+ }
+ this.lastUnreadChannel = channel.name;
}
- this.lastUnreadChannel = channel.name;
}
var badge = null;