summaryrefslogtreecommitdiffstats
path: root/webapp/components/change_url_modal.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/change_url_modal.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/change_url_modal.jsx')
-rw-r--r--webapp/components/change_url_modal.jsx5
1 files changed, 3 insertions, 2 deletions
diff --git a/webapp/components/change_url_modal.jsx b/webapp/components/change_url_modal.jsx
index 9a526a9ee..2219ff317 100644
--- a/webapp/components/change_url_modal.jsx
+++ b/webapp/components/change_url_modal.jsx
@@ -4,6 +4,7 @@
import ReactDOM from 'react-dom';
import Constants from 'utils/constants.jsx';
import {Modal, Tooltip, OverlayTrigger} from 'react-bootstrap';
+import TeamStore from 'stores/team_store.jsx';
import * as Utils from 'utils/utils.jsx';
import {FormattedMessage} from 'react-intl';
@@ -130,8 +131,8 @@ export default class ChangeUrlModal extends React.Component {
serverError = <div className='form-group has-error'><p className='input__help error'>{this.props.serverError}</p></div>;
}
- const fullTeamUrl = Utils.getTeamURLFromAddressBar();
- const teamURL = Utils.getShortenedTeamURL();
+ const fullTeamUrl = TeamStore.getCurrentTeamUrl();
+ const teamURL = Utils.getShortenedTeamURL(TeamStore.getCurrentTeamUrl());
const urlTooltip = (
<Tooltip id='urlTooltip'>{fullTeamUrl}</Tooltip>
);