summaryrefslogtreecommitdiffstats
path: root/webapp/components/more_channels.jsx
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2016-04-04 11:09:59 -0400
committerChristopher Speller <crspeller@gmail.com>2016-04-04 11:09:59 -0400
commit5f3111e8809ccc4fe32cc2958da5a47fd9c09bef (patch)
tree5f84d08557797f6363fc30647967ac227eaa12b6 /webapp/components/more_channels.jsx
parent785553384fe96027b0e9274b6ccc8623092eda70 (diff)
downloadchat-5f3111e8809ccc4fe32cc2958da5a47fd9c09bef.tar.gz
chat-5f3111e8809ccc4fe32cc2958da5a47fd9c09bef.tar.bz2
chat-5f3111e8809ccc4fe32cc2958da5a47fd9c09bef.zip
Fxing some channel changing issues
Diffstat (limited to 'webapp/components/more_channels.jsx')
-rw-r--r--webapp/components/more_channels.jsx4
1 files changed, 2 insertions, 2 deletions
diff --git a/webapp/components/more_channels.jsx b/webapp/components/more_channels.jsx
index 811bb8101..5ccf9c11e 100644
--- a/webapp/components/more_channels.jsx
+++ b/webapp/components/more_channels.jsx
@@ -9,9 +9,9 @@ import * as AsyncClient from 'utils/async_client.jsx';
import ChannelStore from 'stores/channel_store.jsx';
import LoadingScreen from './loading_screen.jsx';
import NewChannelFlow from './new_channel_flow.jsx';
-import * as GlobalActions from 'action_creators/global_actions.jsx';
import {FormattedMessage} from 'react-intl';
+import {browserHistory} from 'react-router';
import loadingGif from 'images/load.gif';
@@ -65,7 +65,7 @@ export default class MoreChannels extends React.Component {
client.joinChannel(channel.id,
() => {
$(ReactDOM.findDOMNode(this.refs.modal)).modal('hide');
- GlobalActions.emitChannelClickEvent(channel);
+ browserHistory.push(Utils.getTeamURLNoOriginFromAddressBar() + '/channels/' + channel.name);
this.setState({joiningChannel: -1});
},
(err) => {