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.
Этот коммит содержится в:
Akihiko Odaki
2017-02-08 00:20:01 +09:00
коммит произвёл enahum
родитель 9bdea0de80
Коммит 68a05653ea
13 изменённых файлов: 54 добавлений и 63 удалений

Просмотреть файл

@@ -6,6 +6,7 @@ import EventEmitter from 'events';
import UserStore from 'stores/user_store.jsx';
import Constants from 'utils/constants.jsx';
import {getSiteURL} from 'utils/url.jsx';
const ActionTypes = Constants.ActionTypes;
const CHANGE_EVENT = 'change';
@@ -122,10 +123,7 @@ class TeamStoreClass extends EventEmitter {
const current = this.getCurrent();
if (current) {
// can't call Utils.getSiteURL here because that introduces a circular dependency
const origin = window.mm_config.SiteURL || window.location.origin;
return origin + '/signup_user_complete/?id=' + current.invite_id;
return getSiteURL() + '/signup_user_complete/?id=' + current.invite_id;
}
return '';
@@ -138,10 +136,7 @@ class TeamStoreClass extends EventEmitter {
return '';
}
// can't call Utils.getSiteURL here because that introduces a circular dependency
const origin = window.mm_config.SiteURL || window.location.origin;
return origin + '/' + team.name;
return getSiteURL() + '/' + team.name;
}
getCurrentStats() {