diff options
author | Asaad Mahmood <Unknowngi@live.com> | 2015-07-29 19:29:41 +0500 |
---|---|---|
committer | Asaad Mahmood <Unknowngi@live.com> | 2015-07-29 19:29:41 +0500 |
commit | 5f2aa88a083f92d263e8f2a57253595071c4b904 (patch) | |
tree | cff481ab565b20289169c0effa49f657063f7af8 /web/react/stores/team_store.jsx | |
parent | ac8706b9f742ce2935e6e9785ecd7ae7358fef0f (diff) | |
parent | 54265271fa16c624570ff89a26ae8596cf0fafc7 (diff) | |
download | chat-5f2aa88a083f92d263e8f2a57253595071c4b904.tar.gz chat-5f2aa88a083f92d263e8f2a57253595071c4b904.tar.bz2 chat-5f2aa88a083f92d263e8f2a57253595071c4b904.zip |
Merge branch 'master' of https://github.com/mattermost/platform into mm-1762
Diffstat (limited to 'web/react/stores/team_store.jsx')
-rw-r--r-- | web/react/stores/team_store.jsx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/web/react/stores/team_store.jsx b/web/react/stores/team_store.jsx index 3f12725f8..e6380d19e 100644 --- a/web/react/stores/team_store.jsx +++ b/web/react/stores/team_store.jsx @@ -11,6 +11,12 @@ var BrowserStore = require('../stores/browser_store.jsx'); var CHANGE_EVENT = 'change'; +var utils; +function getWindowLocationOrigin() { + if (!utils) utils = require('../utils/utils.jsx'); + return utils.getWindowLocationOrigin(); +} + var TeamStore = assign({}, EventEmitter.prototype, { emitChange: function() { this.emit(CHANGE_EVENT); @@ -58,7 +64,7 @@ var TeamStore = assign({}, EventEmitter.prototype, { return null; }, getCurrentTeamUrl: function() { - return window.location.origin + "/" + this.getCurrent().name; + return getWindowLocationOrigin() + "/" + this.getCurrent().name; }, storeTeam: function(team) { var teams = this._getTeams(); |