diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-09-10 15:15:04 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-09-10 15:15:04 -0700 |
| commit | 83b04181da84d0456dfa02b8d52953eb3fd3d7d1 (patch) | |
| tree | 49510d8a6d4be6aeed9a86816cffcbc82d66b09b /web/react/components/sidebar.jsx | |
| parent | 1108ac53063bedcfe00647fa0577e91cf60555de (diff) | |
| parent | 927b474005b9e6c03f7385f4d1a06626dd0450e3 (diff) | |
| download | chat-83b04181da84d0456dfa02b8d52953eb3fd3d7d1.tar.gz chat-83b04181da84d0456dfa02b8d52953eb3fd3d7d1.tar.bz2 chat-83b04181da84d0456dfa02b8d52953eb3fd3d7d1.zip | |
merging
Diffstat (limited to 'web/react/components/sidebar.jsx')
| -rw-r--r-- | web/react/components/sidebar.jsx | 8 |
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; |