From 8c76560b4849f8d1fdc3c3f1c2f1877459a30fca Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Thu, 10 Nov 2016 09:22:06 -0500 Subject: Fix websocket on old versions of IE11 (#4501) --- webapp/utils/utils.jsx | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'webapp/utils') diff --git a/webapp/utils/utils.jsx b/webapp/utils/utils.jsx index 5d456bf83..d2ea25f22 100644 --- a/webapp/utils/utils.jsx +++ b/webapp/utils/utils.jsx @@ -1270,7 +1270,15 @@ export function isValidPassword(password) { } export function getSiteURL() { - return global.mm_config.SiteURL || window.location.origin; + if (global.mm_config.SiteURL) { + return global.mm_config.SiteURL; + } + + if (window.location.origin) { + return window.location.origin; + } + + return window.location.protocol + '//' + window.location.hostname + (window.location.port ? ':' + window.location.port : ''); } export function handleFormattedTextClick(e) { -- cgit v1.2.3-1-g7c22