summaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorJoramWilander <jwawilander@gmail.com>2015-10-23 11:22:08 -0400
committerJoramWilander <jwawilander@gmail.com>2015-10-23 11:22:08 -0400
commitfe82c43eeb403ee2ef3ce2932f64bf00c784a65d (patch)
tree9446b802e63ad247d195df85a83628505627528a /web
parent6724ef4314efbd82e9b608b53679444d60c4ba08 (diff)
downloadchat-fe82c43eeb403ee2ef3ce2932f64bf00c784a65d.tar.gz
chat-fe82c43eeb403ee2ef3ce2932f64bf00c784a65d.tar.bz2
chat-fe82c43eeb403ee2ef3ce2932f64bf00c784a65d.zip
Force updating last viewed at for new posts
Diffstat (limited to 'web')
-rw-r--r--web/react/stores/socket_store.jsx2
-rw-r--r--web/react/utils/async_client.jsx4
2 files changed, 3 insertions, 3 deletions
diff --git a/web/react/stores/socket_store.jsx b/web/react/stores/socket_store.jsx
index 8c3489001..9410c1e9c 100644
--- a/web/react/stores/socket_store.jsx
+++ b/web/react/stores/socket_store.jsx
@@ -158,7 +158,7 @@ function handleNewPostEvent(msg) {
// Update channel state
if (ChannelStore.getCurrentId() === msg.channel_id) {
if (window.isActive) {
- AsyncClient.updateLastViewedAt();
+ AsyncClient.updateLastViewedAt(true);
}
} else {
AsyncClient.getChannel(msg.channel_id);
diff --git a/web/react/utils/async_client.jsx b/web/react/utils/async_client.jsx
index fb7631159..b1bc71d54 100644
--- a/web/react/utils/async_client.jsx
+++ b/web/react/utils/async_client.jsx
@@ -152,14 +152,14 @@ export function getChannel(id) {
);
}
-export function updateLastViewedAt() {
+export function updateLastViewedAt(force) {
const channelId = ChannelStore.getCurrentId();
if (channelId === null) {
return;
}
- if (isCallInProgress(`updateLastViewed${channelId}`)) {
+ if (isCallInProgress(`updateLastViewed${channelId}`) && !force) {
return;
}