summaryrefslogtreecommitdiffstats
path: root/web/react/utils/async_client.jsx
diff options
context:
space:
mode:
authorAsaad Mahmood <Unknowngi@live.com>2015-10-23 21:33:15 +0500
committerAsaad Mahmood <Unknowngi@live.com>2015-10-23 21:33:15 +0500
commite82e09c74348a00aa65c0b3a2d00d704f6476923 (patch)
tree9340315ba280202b0b6aba5f57d1c91bcaa9f0ea /web/react/utils/async_client.jsx
parentfde05f83f373ea6393c0e63b9b1db244033bb667 (diff)
parenta7852a4810b26436cd9ab952d013d610d9d8ec6b (diff)
downloadchat-e82e09c74348a00aa65c0b3a2d00d704f6476923.tar.gz
chat-e82e09c74348a00aa65c0b3a2d00d704f6476923.tar.bz2
chat-e82e09c74348a00aa65c0b3a2d00d704f6476923.zip
Merge branch 'master' of https://github.com/mattermost/platform into ui-improvements
Diffstat (limited to 'web/react/utils/async_client.jsx')
-rw-r--r--web/react/utils/async_client.jsx4
1 files changed, 2 insertions, 2 deletions
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;
}