diff options
| author | Christopher Speller <crspeller@gmail.com> | 2017-01-27 09:30:33 -0500 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2017-01-27 09:30:33 -0500 |
| commit | 8d2e8525a445a80085282142375b0cc68916d552 (patch) | |
| tree | c2627b71c568346bbcca7be4a555744e3c2c757c /webapp/actions | |
| parent | cfbace70ca4222e7abba92c5e3af7440539452c7 (diff) | |
| parent | 0d8bb03b5773923cf52f4d8cb2711131caae105c (diff) | |
| download | chat-8d2e8525a445a80085282142375b0cc68916d552.tar.gz chat-8d2e8525a445a80085282142375b0cc68916d552.tar.bz2 chat-8d2e8525a445a80085282142375b0cc68916d552.zip | |
Merge branch 'release-3.6'
Diffstat (limited to 'webapp/actions')
| -rw-r--r-- | webapp/actions/websocket_actions.jsx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/webapp/actions/websocket_actions.jsx b/webapp/actions/websocket_actions.jsx index 9a52eb05c..1a0ddda63 100644 --- a/webapp/actions/websocket_actions.jsx +++ b/webapp/actions/websocket_actions.jsx @@ -67,9 +67,15 @@ export function close() { WebSocketClient.close(); } -export function reconnect() { +function reconnectWebSocket() { close(); initialize(); +} + +export function reconnect(includeWebSocket = true) { + if (includeWebSocket) { + reconnectWebSocket(); + } if (Client.teamId) { loadChannelsForCurrentUser(); |