diff options
| author | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-07-24 14:13:19 -0700 |
|---|---|---|
| committer | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-07-27 08:39:28 -0700 |
| commit | 52bf726ddfaa0d5010ce7a80fe1f03a485df9279 (patch) | |
| tree | e941ae9276f106f5dbf3209d9e69bac50d603760 /web/react/utils/utils.jsx | |
| parent | 85ff151b71a5b0a488b7a8c3f0978b5d0ee8e280 (diff) | |
| download | chat-52bf726ddfaa0d5010ce7a80fe1f03a485df9279.tar.gz chat-52bf726ddfaa0d5010ce7a80fe1f03a485df9279.tar.bz2 chat-52bf726ddfaa0d5010ce7a80fe1f03a485df9279.zip | |
Fixes issue with images not displaying due to window.origin not being defined in IE10
Diffstat (limited to 'web/react/utils/utils.jsx')
| -rw-r--r-- | web/react/utils/utils.jsx | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx index 00580af6e..98dae9084 100644 --- a/web/react/utils/utils.jsx +++ b/web/react/utils/utils.jsx @@ -22,8 +22,6 @@ module.exports.cleanUpUrlable = function(input) { return cleaned; }; - - module.exports.isTestDomain = function() { if ((/^localhost/).test(window.location.hostname)) @@ -838,3 +836,11 @@ module.exports.getDisplayName = function(user) { } } }; + +//IE10 does not set window.location.origin automatically so this must be called instead when using it +module.exports.getWindowLocationOrigin = function() { + if (!window.location.origin) { + window.location.origin = window.location.protocol + "//" + window.location.hostname + (window.location.port ? ':' + window.location.port: ''); + } + return window.location.origin; +}; |