summaryrefslogtreecommitdiffstats
path: root/webapp/root.jsx
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2017-02-15 18:54:24 -0500
committerGitHub <noreply@github.com>2017-02-15 18:54:24 -0500
commitdb2966b7cb3111ff1b3cadfbec1221343b0e8629 (patch)
treee2b64183860e98807a4d77401db3dcdf61d2a6a7 /webapp/root.jsx
parent745e2f4923c653c7b9bff990375d9f3f67b4c212 (diff)
downloadchat-db2966b7cb3111ff1b3cadfbec1221343b0e8629.tar.gz
chat-db2966b7cb3111ff1b3cadfbec1221343b0e8629.tar.bz2
chat-db2966b7cb3111ff1b3cadfbec1221343b0e8629.zip
Remove MakeDirectChannelVisible and add client handling for showing DMs (#5430)
Diffstat (limited to 'webapp/root.jsx')
-rw-r--r--webapp/root.jsx5
1 files changed, 4 insertions, 1 deletions
diff --git a/webapp/root.jsx b/webapp/root.jsx
index 93cfa5a38..98c744477 100644
--- a/webapp/root.jsx
+++ b/webapp/root.jsx
@@ -12,6 +12,7 @@ import * as GlobalActions from 'actions/global_actions.jsx';
import * as Websockets from 'actions/websocket_actions.jsx';
import BrowserStore from 'stores/browser_store.jsx';
import ChannelStore from 'stores/channel_store.jsx';
+import UserStore from 'stores/user_store.jsx';
import * as I18n from 'i18n/i18n.jsx';
import * as AsyncClient from 'utils/async_client.jsx';
@@ -60,7 +61,9 @@ function preRenderSetup(callwhendone) {
$(window).on('beforeunload',
() => {
BrowserStore.setLastServerVersion('');
- AsyncClient.viewChannel('', ChannelStore.getCurrentId() || '');
+ if (UserStore.getCurrentUser()) {
+ AsyncClient.viewChannel('', ChannelStore.getCurrentId() || '');
+ }
Websockets.close();
}
);