summaryrefslogtreecommitdiffstats
path: root/web/react/stores/channel_store.jsx
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2016-02-09 11:09:29 -0500
committerChristopher Speller <crspeller@gmail.com>2016-02-09 11:18:50 -0500
commit0d50cdd390198d18c3298be5cafc39dfd4d67bbd (patch)
tree6d281c7f72fddf67c9fa987781ec91ca6395140f /web/react/stores/channel_store.jsx
parentffcca796c3b7f14eac52d4d1542105ef03b047a5 (diff)
downloadchat-0d50cdd390198d18c3298be5cafc39dfd4d67bbd.tar.gz
chat-0d50cdd390198d18c3298be5cafc39dfd4d67bbd.tar.bz2
chat-0d50cdd390198d18c3298be5cafc39dfd4d67bbd.zip
Changing meation behaviour to show meantion when viewing channel but tab is not focused
Diffstat (limited to 'web/react/stores/channel_store.jsx')
-rw-r--r--web/react/stores/channel_store.jsx4
1 files changed, 2 insertions, 2 deletions
diff --git a/web/react/stores/channel_store.jsx b/web/react/stores/channel_store.jsx
index d650b23c2..ac800a988 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) {
+ if (currentId && !document.hidden) {
ChannelStore.resetCounts(currentId);
}
ChannelStore.setUnreadCounts();
@@ -321,7 +321,7 @@ ChannelStore.dispatchToken = AppDispatcher.register((payload) => {
ChannelStore.pStoreChannelMember(action.member);
}
currentId = ChannelStore.getCurrentId();
- if (currentId) {
+ if (currentId && !document.hidden) {
ChannelStore.resetCounts(currentId);
}
ChannelStore.setUnreadCount(action.channel.id);