diff options
Diffstat (limited to 'web/react/stores')
-rw-r--r-- | web/react/stores/team_store.jsx | 8 | ||||
-rw-r--r-- | web/react/stores/user_store.jsx | 4 |
2 files changed, 9 insertions, 3 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(); diff --git a/web/react/stores/user_store.jsx b/web/react/stores/user_store.jsx index 001162f47..aff5a0bed 100644 --- a/web/react/stores/user_store.jsx +++ b/web/react/stores/user_store.jsx @@ -164,13 +164,13 @@ var UserStore = assign({}, EventEmitter.prototype, { BrowserStore.setItem("sessions", sessions); }, getSessions: function() { - return BrowserStore.getItem("sessions", []); + return BrowserStore.getItem("sessions", {loading: true}); }, setAudits: function(audits) { BrowserStore.setItem("audits", audits); }, getAudits: function() { - return BrowserStore.getItem("audits", []); + return BrowserStore.getItem("audits", {loading: true}); }, setTeams: function(teams) { BrowserStore.setItem("teams", teams); |