summaryrefslogtreecommitdiffstats
path: root/webapp/components/more_channels.jsx
diff options
context:
space:
mode:
authorCorey Hulen <corey@hulen.com>2016-03-29 08:08:25 -0700
committerCorey Hulen <corey@hulen.com>2016-03-29 08:08:25 -0700
commitd921c112de622c1919650bc919d32681112cf3a9 (patch)
tree9103b0d16fa676f15591f9704fa62f673aa23cac /webapp/components/more_channels.jsx
parent4a6edbfd0854c097cf8fb64a3ddd75b43dfcd401 (diff)
parent5ce1a4368bafbd2ed50b1953658fca285cfd349b (diff)
downloadchat-d921c112de622c1919650bc919d32681112cf3a9.tar.gz
chat-d921c112de622c1919650bc919d32681112cf3a9.tar.bz2
chat-d921c112de622c1919650bc919d32681112cf3a9.zip
Merge pull request #2558 from mattermost/center-panel-refactor
PLT-2382, PLT-2386, PLT-2455 Channel/permalink view cleanup and fixes.
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 d0eeec1ef..811bb8101 100644
--- a/webapp/components/more_channels.jsx
+++ b/webapp/components/more_channels.jsx
@@ -9,6 +9,7 @@ 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';
@@ -64,8 +65,7 @@ export default class MoreChannels extends React.Component {
client.joinChannel(channel.id,
() => {
$(ReactDOM.findDOMNode(this.refs.modal)).modal('hide');
- AsyncClient.getChannel(channel.id);
- Utils.switchChannel(channel);
+ GlobalActions.emitChannelClickEvent(channel);
this.setState({joiningChannel: -1});
},
(err) => {