IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/mattermost/platform into ui-improvements

Browse Source
This commit is contained in:
Asaad Mahmood
2015-10-23 21:33:15 +05:00
parent fde05f83f3 a7852a4810
commit e82e09c743
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
web/react/stores/browser_store.jsx
View File

@@ -74,9 +74,9 @@ class BrowserStoreClass {
var result = null;
try {
if (this.isLocalStorageSupported()) {
result = JSON.parse(getPrefix() + localStorage.getItem(name));
result = JSON.parse(localStorage.getItem(getPrefix() + name));
} else {
result = JSON.parse(getPrefix() + sessionStorage.getItem(name));
result = JSON.parse(sessionStorage.getItem(getPrefix() + name));
}
} catch (err) {
result = null;

2
web/react/stores/socket_store.jsx
View File

@@ -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);

4
web/react/utils/async_client.jsx
View File

@@ -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;
}