diff options
| author | Christopher Speller <crspeller@gmail.com> | 2016-02-13 10:30:37 -0500 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-02-13 10:30:37 -0500 |
| commit | 4721e5cd2b4016041ad5ae4b9e1d833e8575acc9 (patch) | |
| tree | 84107b24cb5027d0354a1f69f38ed15c0855a846 /web/react/components | |
| parent | 902ee885701bacda2d45e3f09a98f0d16f840a84 (diff) | |
| parent | c861a24d48d2cb5417f704eca7d28db7637275f6 (diff) | |
| download | chat-4721e5cd2b4016041ad5ae4b9e1d833e8575acc9.tar.gz chat-4721e5cd2b4016041ad5ae4b9e1d833e8575acc9.tar.bz2 chat-4721e5cd2b4016041ad5ae4b9e1d833e8575acc9.zip | |
Merge pull request #2164 from mattermost/unread-tab-fix
RC3 Fix badge and tab */(1) not disappearing until switching away from channel
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); |