diff options
author | Harrison Healey <harrisonmhealey@gmail.com> | 2016-03-24 12:45:12 -0400 |
---|---|---|
committer | Harrison Healey <harrisonmhealey@gmail.com> | 2016-03-24 12:45:12 -0400 |
commit | c64b12e27a4218f27bfdfd935fd64ea43f0e6e26 (patch) | |
tree | 625baa2a878d1ad9992085649a998fd5f9088094 /webapp/utils/utils.jsx | |
parent | 998ce12133358eab587702e258edefbd437f86ba (diff) | |
parent | d6a6668a39db2f78d59919686c5d7b901888da36 (diff) | |
download | chat-c64b12e27a4218f27bfdfd935fd64ea43f0e6e26.tar.gz chat-c64b12e27a4218f27bfdfd935fd64ea43f0e6e26.tar.bz2 chat-c64b12e27a4218f27bfdfd935fd64ea43f0e6e26.zip |
Merge pull request #2529 from mattermost/plt-2383
PLT-2383 Fixed system console login page flash.
Diffstat (limited to 'webapp/utils/utils.jsx')
-rw-r--r-- | webapp/utils/utils.jsx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/webapp/utils/utils.jsx b/webapp/utils/utils.jsx index 1379455ca..ac12edb82 100644 --- a/webapp/utils/utils.jsx +++ b/webapp/utils/utils.jsx @@ -17,6 +17,7 @@ import * as client from './client.jsx'; import Autolinker from 'autolinker'; import React from 'react'; +import {browserHistory} from 'react-router'; import {FormattedTime} from 'react-intl'; import icon50 from 'images/icon50x50.png'; @@ -170,7 +171,7 @@ export function notifyMe(title, body, channel) { if (channel) { switchChannel(channel); } else { - window.location.href = TeamStore.getCurrentTeamUrl() + '/channels/town-square'; + browserHistory.push(TeamStore.getCurrentTeamUrl() + '/channels/town-square'); } }; setTimeout(() => { @@ -1303,7 +1304,7 @@ export function openDirectChannelToUser(user, successCb, errorCb) { } }, () => { - window.location.href = TeamStore.getCurrentTeamUrl() + '/channels/' + channelName; + browserHistory.push(TeamStore.getCurrentTeamUrl() + '/channels/' + channelName); if ($.isFunction(errorCb)) { errorCb(); } |