From 52bf726ddfaa0d5010ce7a80fe1f03a485df9279 Mon Sep 17 00:00:00 2001 From: Reed Garmsen Date: Fri, 24 Jul 2015 14:13:19 -0700 Subject: Fixes issue with images not displaying due to window.origin not being defined in IE10 --- web/react/utils/utils.jsx | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'web/react/utils/utils.jsx') 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; +}; -- cgit v1.2.3-1-g7c22 From 91fa6c8da1cbf6647791fa43699eb310f990e7e9 Mon Sep 17 00:00:00 2001 From: Reed Garmsen Date: Mon, 27 Jul 2015 13:21:50 -0700 Subject: Removed usage of window.location.origin throughout the codebase --- web/react/utils/utils.jsx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'web/react/utils/utils.jsx') diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx index 98dae9084..cd27afe61 100644 --- a/web/react/utils/utils.jsx +++ b/web/react/utils/utils.jsx @@ -839,8 +839,9 @@ 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: ''); + var windowLocationOrigin = window.location.origin; + if (!windowLocationOrigin) { + windowLocationOrigin = window.location.protocol + "//" + window.location.hostname + (window.location.port ? ':' + window.location.port: ''); } - return window.location.origin; + return windowLocationOrigin; }; -- cgit v1.2.3-1-g7c22