summaryrefslogtreecommitdiffstats
path: root/webapp/components/change_url_modal.jsx
diff options
context:
space:
mode:
authorAkihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp>2017-02-08 00:20:01 +0900
committerenahum <nahumhbl@gmail.com>2017-02-07 07:20:01 -0800
commit68a05653ea6f2588a27c8ce523b0d213e48f6480 (patch)
tree4b99b1f3424ae83a4908386d53caa7dd09f8bf54 /webapp/components/change_url_modal.jsx
parent9bdea0de80a21b214eb9041057ab8e3fea681a8b (diff)
downloadchat-68a05653ea6f2588a27c8ce523b0d213e48f6480.tar.gz
chat-68a05653ea6f2588a27c8ce523b0d213e48f6480.tar.bz2
chat-68a05653ea6f2588a27c8ce523b0d213e48f6480.zip
Add webapp/utils/url.jsx (#5285)
webapp/utils/utils.jsx got big and that caused a potential circular dependency with webapp/stores/team_store.jsx. This change solves the issue by introducing webapp/utils/url.jsx and moving URL-related functions, which is not likely to depend on actions and stores, from webapp/utils/utils.jsx.
Diffstat (limited to 'webapp/components/change_url_modal.jsx')
-rw-r--r--webapp/components/change_url_modal.jsx6
1 files changed, 3 insertions, 3 deletions
diff --git a/webapp/components/change_url_modal.jsx b/webapp/components/change_url_modal.jsx
index ddbfdf83a..4abc469ea 100644
--- a/webapp/components/change_url_modal.jsx
+++ b/webapp/components/change_url_modal.jsx
@@ -5,7 +5,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 * as URL from 'utils/url.jsx';
import {FormattedMessage} from 'react-intl';
@@ -105,7 +105,7 @@ export default class ChangeUrlModal extends React.Component {
e.preventDefault();
const url = ReactDOM.findDOMNode(this.refs.urlinput).value;
- const cleanedURL = Utils.cleanUpUrlable(url);
+ const cleanedURL = URL.cleanUpUrlable(url);
if (cleanedURL !== url || url.length < 2 || url.indexOf('__') > -1) {
this.setState({urlError: this.getURLError(url)});
return;
@@ -136,7 +136,7 @@ export default class ChangeUrlModal extends React.Component {
}
const fullTeamUrl = TeamStore.getCurrentTeamUrl();
- const teamURL = Utils.getShortenedTeamURL(TeamStore.getCurrentTeamUrl());
+ const teamURL = URL.getShortenedTeamURL(TeamStore.getCurrentTeamUrl());
const urlTooltip = (
<Tooltip id='urlTooltip'>{fullTeamUrl}</Tooltip>
);