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/sidebar.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/sidebar.jsx')
-rw-r--r-- | webapp/components/sidebar.jsx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/webapp/components/sidebar.jsx b/webapp/components/sidebar.jsx index 0e1b7dd0e..c0d4755ed 100644 --- a/webapp/components/sidebar.jsx +++ b/webapp/components/sidebar.jsx @@ -29,6 +29,7 @@ import {Tooltip, OverlayTrigger} from 'react-bootstrap'; import loadingGif from 'images/load.gif'; import React from 'react'; +import {browserHistory} from 'react-router'; import favicon from 'images/favicon/favicon-16x16.png'; import redFavicon from 'images/favicon/redfavicon-16x16.png'; @@ -407,7 +408,6 @@ export default class Sidebar extends React.Component { // set up click handler to switch channels (or create a new channel for non-existant ones) var handleClick = null; - var href = '#'; if (!channel.fake) { handleClick = function clickHandler(e) { @@ -440,7 +440,7 @@ export default class Sidebar extends React.Component { }, () => { this.setState({loadingDMChannel: -1}); - window.location.href = '/' + this.state.currentTeam.name; + browserHistory('/' + this.state.currentTeam.name); } ); } @@ -489,7 +489,7 @@ export default class Sidebar extends React.Component { > <a className={rowClass} - href={href} + href={'#'} onClick={handleClick} > {icon} |