diff options
| author | Christopher Speller <crspeller@gmail.com> | 2016-02-13 11:03:10 -0500 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-02-13 11:03:10 -0500 |
| commit | 958b588448a0bc405068345f267aa623c5014d67 (patch) | |
| tree | 3f871a2c7654b739e9d8e9d020946d6ceee67b6a /web/react/components | |
| parent | 45dfd516aab37c1c336ac3410ee8db0d7c56d65a (diff) | |
| parent | c71c5cef632c7dc68072167c6fe091a60835fa02 (diff) | |
| download | chat-958b588448a0bc405068345f267aa623c5014d67.tar.gz chat-958b588448a0bc405068345f267aa623c5014d67.tar.bz2 chat-958b588448a0bc405068345f267aa623c5014d67.zip | |
Merge branch 'release-2.0'
Diffstat (limited to 'web/react/components')
| -rw-r--r-- | web/react/components/channel_loader.jsx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/web/react/components/channel_loader.jsx b/web/react/components/channel_loader.jsx index 174c8c4e1..f3000ee05 100644 --- a/web/react/components/channel_loader.jsx +++ b/web/react/components/channel_loader.jsx @@ -95,6 +95,8 @@ class ChannelLoader extends React.Component { $(window).on('focus', function windowFocus() { AsyncClient.updateLastViewedAt(); + ChannelStore.resetCounts(ChannelStore.getCurrentId()); + ChannelStore.emitChange(); window.isActive = true; }); @@ -185,4 +187,4 @@ ChannelLoader.propTypes = { intl: intlShape.isRequired }; -export default injectIntl(ChannelLoader);
\ No newline at end of file +export default injectIntl(ChannelLoader); |