diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-10-23 12:16:31 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-10-23 12:16:31 -0400 |
| commit | a7852a4810b26436cd9ab952d013d610d9d8ec6b (patch) | |
| tree | b8ce149c593ab1e63a24456988981ad492c28de2 /web | |
| parent | 3e348220dc2edbca017bfab06b887af3f3ec9d88 (diff) | |
| parent | fe82c43eeb403ee2ef3ce2932f64bf00c784a65d (diff) | |
| download | chat-a7852a4810b26436cd9ab952d013d610d9d8ec6b.tar.gz chat-a7852a4810b26436cd9ab952d013d610d9d8ec6b.tar.bz2 chat-a7852a4810b26436cd9ab952d013d610d9d8ec6b.zip | |
Merge pull request #1160 from mattermost/force-last-viewed
Force updating last viewed at for new posts
Diffstat (limited to 'web')
| -rw-r--r-- | web/react/stores/socket_store.jsx | 2 | ||||
| -rw-r--r-- | web/react/utils/async_client.jsx | 4 |
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; } |