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/utils/utils.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/utils/utils.jsx')
-rw-r--r-- | web/react/utils/utils.jsx | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx index fbf1e0d4f..8a4d92b85 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)) @@ -841,3 +839,12 @@ 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() { + var windowLocationOrigin = window.location.origin; + if (!windowLocationOrigin) { + windowLocationOrigin = window.location.protocol + "//" + window.location.hostname + (window.location.port ? ':' + window.location.port: ''); + } + return windowLocationOrigin; +}; |