summaryrefslogtreecommitdiffstats
path: root/webapp/components/more_channels.jsx
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2016-08-02 16:37:09 -0400
committerGitHub <noreply@github.com>2016-08-02 16:37:09 -0400
commitc4a3118e9f885e92bb9b7d882898e9a51fc3be69 (patch)
tree7564e7aa04e7c656781b34375d6964d029755c38 /webapp/components/more_channels.jsx
parente67bbcb0ae483cc86ae3a80ace36f1e6e663b589 (diff)
downloadchat-c4a3118e9f885e92bb9b7d882898e9a51fc3be69.tar.gz
chat-c4a3118e9f885e92bb9b7d882898e9a51fc3be69.tar.bz2
chat-c4a3118e9f885e92bb9b7d882898e9a51fc3be69.zip
PLT-3408 Add SiteURL to config.json (#3692)
* PLT-3408 Changed serverside code to get the service's URL from config.json * PLT-3408 Changed most clientside code to use the SiteURL config setting instead of window.location * PLT-3408 Changed default SiteURL to be autodetected
Diffstat (limited to 'webapp/components/more_channels.jsx')
-rw-r--r--webapp/components/more_channels.jsx2
1 files changed, 1 insertions, 1 deletions
diff --git a/webapp/components/more_channels.jsx b/webapp/components/more_channels.jsx
index b7ffff712..724cd2f60 100644
--- a/webapp/components/more_channels.jsx
+++ b/webapp/components/more_channels.jsx
@@ -74,7 +74,7 @@ export default class MoreChannels extends React.Component {
channel,
() => {
$(ReactDOM.findDOMNode(this.refs.modal)).modal('hide');
- browserHistory.push(Utils.getTeamURLNoOriginFromAddressBar() + '/channels/' + channel.name);
+ browserHistory.push(TeamStore.getCurrentTeamRelativeUrl() + '/channels/' + channel.name);
this.setState({joiningChannel: ''});
},
(err) => {