From 68a05653ea6f2588a27c8ce523b0d213e48f6480 Mon Sep 17 00:00:00 2001 From: Akihiko Odaki Date: Wed, 8 Feb 2017 00:20:01 +0900 Subject: 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. --- webapp/components/change_url_modal.jsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'webapp/components/change_url_modal.jsx') 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 = ( {fullTeamUrl} ); -- cgit v1.2.3-1-g7c22