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/stores/channel_store.jsx | |
| 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/stores/channel_store.jsx')
| -rw-r--r-- | web/react/stores/channel_store.jsx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/web/react/stores/channel_store.jsx b/web/react/stores/channel_store.jsx index ac800a988..60cb10de7 100644 --- a/web/react/stores/channel_store.jsx +++ b/web/react/stores/channel_store.jsx @@ -308,7 +308,7 @@ ChannelStore.dispatchToken = AppDispatcher.register((payload) => { ChannelStore.storeChannels(action.channels); ChannelStore.storeChannelMembers(action.members); currentId = ChannelStore.getCurrentId(); - if (currentId && !document.hidden) { + if (currentId && window.isActive) { ChannelStore.resetCounts(currentId); } ChannelStore.setUnreadCounts(); @@ -321,7 +321,7 @@ ChannelStore.dispatchToken = AppDispatcher.register((payload) => { ChannelStore.pStoreChannelMember(action.member); } currentId = ChannelStore.getCurrentId(); - if (currentId && !document.hidden) { + if (currentId && window.isActive) { ChannelStore.resetCounts(currentId); } ChannelStore.setUnreadCount(action.channel.id); |