diff options
author | Asaad Mahmood <Unknowngi@live.com> | 2015-10-23 21:33:15 +0500 |
---|---|---|
committer | Asaad Mahmood <Unknowngi@live.com> | 2015-10-23 21:33:15 +0500 |
commit | e82e09c74348a00aa65c0b3a2d00d704f6476923 (patch) | |
tree | 9340315ba280202b0b6aba5f57d1c91bcaa9f0ea /web/react/stores | |
parent | fde05f83f373ea6393c0e63b9b1db244033bb667 (diff) | |
parent | a7852a4810b26436cd9ab952d013d610d9d8ec6b (diff) | |
download | chat-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/stores')
-rw-r--r-- | web/react/stores/browser_store.jsx | 4 | ||||
-rw-r--r-- | web/react/stores/socket_store.jsx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/web/react/stores/browser_store.jsx b/web/react/stores/browser_store.jsx index adaca44ee..75fb8aa3c 100644 --- a/web/react/stores/browser_store.jsx +++ b/web/react/stores/browser_store.jsx @@ -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; 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); |