diff options
Diffstat (limited to 'webapp/utils/async_client.jsx')
-rw-r--r-- | webapp/utils/async_client.jsx | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/webapp/utils/async_client.jsx b/webapp/utils/async_client.jsx index 6535c024d..6f5f8a2cd 100644 --- a/webapp/utils/async_client.jsx +++ b/webapp/utils/async_client.jsx @@ -3,7 +3,7 @@ import $ from 'jquery'; import Client from './web_client.jsx'; -import * as GlobalActions from 'action_creators/global_actions.jsx'; +import * as GlobalActions from 'actions/global_actions.jsx'; import AppDispatcher from '../dispatcher/app_dispatcher.jsx'; import BrowserStore from 'stores/browser_store.jsx'; import ChannelStore from 'stores/channel_store.jsx'; @@ -47,7 +47,21 @@ function isCallInProgress(callName) { return true; } -export function getChannels(checkVersion) { +export function checkVersion() { + var serverVersion = Client.getServerVersion(); + + if (serverVersion !== BrowserStore.getLastServerVersion()) { + if (!BrowserStore.getLastServerVersion() || BrowserStore.getLastServerVersion() === '') { + BrowserStore.setLastServerVersion(serverVersion); + } else { + BrowserStore.setLastServerVersion(serverVersion); + window.location.reload(true); + console.log('Detected version update refreshing the page'); //eslint-disable-line no-console + } + } +} + +export function getChannels(doVersionCheck) { if (isCallInProgress('getChannels')) { return null; } @@ -58,18 +72,8 @@ export function getChannels(checkVersion) { (data) => { callTracker.getChannels = 0; - if (checkVersion) { - var serverVersion = Client.getServerVersion(); - - if (serverVersion !== BrowserStore.getLastServerVersion()) { - if (!BrowserStore.getLastServerVersion() || BrowserStore.getLastServerVersion() === '') { - BrowserStore.setLastServerVersion(serverVersion); - } else { - BrowserStore.setLastServerVersion(serverVersion); - window.location.reload(true); - console.log('Detected version update refreshing the page'); //eslint-disable-line no-console - } - } + if (doVersionCheck) { + checkVersion(); } AppDispatcher.handleServerAction({ |