diff options
author | Joram Wilander <jwawilander@gmail.com> | 2016-04-04 12:24:12 -0400 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2016-04-04 12:24:12 -0400 |
commit | 2bdab516b293d97f9797039e84f9d04656d2134d (patch) | |
tree | cf53b8f94f4f3d7ec1d697457c9847009035c058 /webapp/components/removed_from_channel_modal.jsx | |
parent | 2bb9332467f54ed6e2bc39e088c1268a61b24b6e (diff) | |
parent | 5f3111e8809ccc4fe32cc2958da5a47fd9c09bef (diff) | |
download | chat-2bdab516b293d97f9797039e84f9d04656d2134d.tar.gz chat-2bdab516b293d97f9797039e84f9d04656d2134d.tar.bz2 chat-2bdab516b293d97f9797039e84f9d04656d2134d.zip |
Merge pull request #2625 from mattermost/plt-2502
PLT-2502 Fxing some channel changing issues
Diffstat (limited to 'webapp/components/removed_from_channel_modal.jsx')
-rw-r--r-- | webapp/components/removed_from_channel_modal.jsx | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/webapp/components/removed_from_channel_modal.jsx b/webapp/components/removed_from_channel_modal.jsx index 45018ac99..d037c089d 100644 --- a/webapp/components/removed_from_channel_modal.jsx +++ b/webapp/components/removed_from_channel_modal.jsx @@ -6,9 +6,10 @@ import ReactDOM from 'react-dom'; import ChannelStore from 'stores/channel_store.jsx'; import UserStore from 'stores/user_store.jsx'; import BrowserStore from 'stores/browser_store.jsx'; -import * as GlobalActions from 'action_creators/global_actions.jsx'; +import * as Utils from 'utils/utils.jsx'; import {FormattedMessage} from 'react-intl'; +import {browserHistory} from 'react-router'; import React from 'react'; @@ -33,7 +34,11 @@ export default class RemovedFromChannelModal extends React.Component { } var townSquare = ChannelStore.getByName('town-square'); - setTimeout(() => GlobalActions.emitChannelClickEvent(townSquare), 1); + setTimeout( + () => { + browserHistory.push(Utils.getTeamURLNoOriginFromAddressBar() + '/channels/' + townSquare.name); + }, + 1); this.setState(newState); } |