diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-12-04 08:38:44 -0500 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-12-04 08:38:44 -0500 |
| commit | 622fbc67402fe36bc01163a5a80643a15758e094 (patch) | |
| tree | 5daef39256c90fd943e97aab1e7186d68f8ff91f | |
| parent | 3b892a3d04695f0b76e636418726c3283f03c394 (diff) | |
| parent | 2cda7c967fe8b10ad3c0bf742c7636a5bf419d69 (diff) | |
| download | chat-622fbc67402fe36bc01163a5a80643a15758e094.tar.gz chat-622fbc67402fe36bc01163a5a80643a15758e094.tar.bz2 chat-622fbc67402fe36bc01163a5a80643a15758e094.zip | |
Merge pull request #1612 from mattermost/fix-build-update
Fixing mattermost to refresh the page when a new version is detected
| -rw-r--r-- | web/react/dispatcher/event_helpers.jsx | 2 | ||||
| -rw-r--r-- | web/react/utils/async_client.jsx | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/web/react/dispatcher/event_helpers.jsx b/web/react/dispatcher/event_helpers.jsx index 3deddd754..306c59e8b 100644 --- a/web/react/dispatcher/event_helpers.jsx +++ b/web/react/dispatcher/event_helpers.jsx @@ -10,7 +10,7 @@ import * as AsyncClient from '../utils/async_client.jsx'; import * as Client from '../utils/client.jsx'; export function emitChannelClickEvent(channel) { - AsyncClient.getChannels(); + AsyncClient.getChannels(true); AsyncClient.getChannelExtraInfo(channel.id); AsyncClient.updateLastViewedAt(channel.id); AsyncClient.getPosts(channel.id); diff --git a/web/react/utils/async_client.jsx b/web/react/utils/async_client.jsx index d97c7c3cb..88b5aa739 100644 --- a/web/react/utils/async_client.jsx +++ b/web/react/utils/async_client.jsx @@ -55,9 +55,13 @@ export function getChannels(checkVersion) { var serverVersion = xhr.getResponseHeader('X-Version-ID'); if (serverVersion !== BrowserStore.getLastServerVersion()) { - BrowserStore.setLastServerVersion(serverVersion); - window.location.reload(true); - console.log('Detected version update refreshing the page'); //eslint-disable-line no-console + 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 + } } } |