diff options
| author | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-06-18 14:10:47 -0700 |
|---|---|---|
| committer | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-06-18 14:10:47 -0700 |
| commit | 3cd793fcb9bb02d5a130f277bff18f93db13d970 (patch) | |
| tree | bab4b9b559874b4ee79a43064a8018eda2a5af34 /web/react/utils/utils.jsx | |
| parent | 66425c97e49615111448aa24e31225dfa3b51cda (diff) | |
| parent | 4f321383b33ab805f22e7172a54925b1cd353fcb (diff) | |
| download | chat-3cd793fcb9bb02d5a130f277bff18f93db13d970.tar.gz chat-3cd793fcb9bb02d5a130f277bff18f93db13d970.tar.bz2 chat-3cd793fcb9bb02d5a130f277bff18f93db13d970.zip | |
Merge pull request #13 from rgarmsen2295/master
Remerge
Diffstat (limited to 'web/react/utils/utils.jsx')
| -rw-r--r-- | web/react/utils/utils.jsx | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx index 628d92342..e57088614 100644 --- a/web/react/utils/utils.jsx +++ b/web/react/utils/utils.jsx @@ -28,6 +28,9 @@ module.exports.isTestDomain = function() { if ((/^localhost/).test(window.location.hostname)) return true; + if ((/^dockerhost/).test(window.location.hostname)) + return true; + if ((/^test/).test(window.location.hostname)) return true; @@ -75,8 +78,14 @@ module.exports.getDomainWithOutSub = function() { var parts = window.location.host.split("."); - if (parts.length == 1) - return "localhost:8065"; + if (parts.length == 1) { + if (parts[0].indexOf("dockerhost") > -1) { + return "dockerhost:8065"; + } + else { + return "localhost:8065"; + } + } return parts[1] + "." + parts[2]; } |