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/components/navbar.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/components/navbar.jsx')
-rw-r--r-- | webapp/components/navbar.jsx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/webapp/components/navbar.jsx b/webapp/components/navbar.jsx index 520f05ed0..e58e142d0 100644 --- a/webapp/components/navbar.jsx +++ b/webapp/components/navbar.jsx @@ -30,6 +30,8 @@ import {FormattedMessage} from 'react-intl'; import {Popover, OverlayTrigger} from 'react-bootstrap'; +import {Link, browserHistory} from 'react-router'; + import React from 'react'; export default class Navbar extends React.Component { @@ -81,7 +83,7 @@ export default class Navbar extends React.Component { Client.leaveChannel(this.state.channel.id, () => { AsyncClient.getChannels(true); - window.location.href = TeamStore.getCurrentTeamUrl() + '/channels/town-square'; + browserHistory.push(TeamStore.getCurrentTeamUrl() + '/channels/town-square'); }, (err) => { AsyncClient.dispatchError(err, 'handleLeave'); @@ -349,12 +351,12 @@ export default class Navbar extends React.Component { return ( <div className='navbar-brand'> - <a - href={TeamStore.getCurrentTeamUrl() + '/channels/town-square'} + <Link + to={TeamStore.getCurrentTeamUrl() + '/channels/town-square'} className='heading' > {channelTitle} - </a> + </Link> </div> ); } |