diff options
author | Christopher Speller <crspeller@gmail.com> | 2015-07-29 08:32:48 -0400 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2015-07-29 08:32:48 -0400 |
commit | a9e9d10e41e6c3d1609095a6a370a4632d22e19c (patch) | |
tree | 310b919bf0044fc0f6c59abf5b0f7509e257cfa1 /web/react/stores/team_store.jsx | |
parent | 35fe9655c3164eead46b18db9e40c8b677cca636 (diff) | |
parent | 91fa6c8da1cbf6647791fa43699eb310f990e7e9 (diff) | |
download | chat-a9e9d10e41e6c3d1609095a6a370a4632d22e19c.tar.gz chat-a9e9d10e41e6c3d1609095a6a370a4632d22e19c.tar.bz2 chat-a9e9d10e41e6c3d1609095a6a370a4632d22e19c.zip |
Merge pull request #252 from rgarmsen2295/ie10-image-regression-fix
Fixes issue with images not displaying in IE10 due to window.location.origin not being defined in IE10
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(); |