diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2015-06-18 14:59:22 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2015-06-18 14:59:22 -0400 |
| commit | c64f5eae55e1665681ee7a1b60d3192a54df9f84 (patch) | |
| tree | eef49438d1b617e71a29e77e22859ed925926966 /web/react/utils | |
| parent | f1dbf69c767cfa5514cfcc7c3e505d5cd4ed35b3 (diff) | |
| parent | a5ce5972ba527ce2617ccb539ef045f1f425c373 (diff) | |
| download | chat-c64f5eae55e1665681ee7a1b60d3192a54df9f84.tar.gz chat-c64f5eae55e1665681ee7a1b60d3192a54df9f84.tar.bz2 chat-c64f5eae55e1665681ee7a1b60d3192a54df9f84.zip | |
Merge pull request #30 from mattermost/dockerhost
fix for dockerhost HELIUM
Diffstat (limited to 'web/react/utils')
| -rw-r--r-- | web/react/utils/constants.jsx | 1 | ||||
| -rw-r--r-- | web/react/utils/utils.jsx | 13 |
2 files changed, 12 insertions, 2 deletions
diff --git a/web/react/utils/constants.jsx b/web/react/utils/constants.jsx index 0a3b1db3d..deb07409b 100644 --- a/web/react/utils/constants.jsx +++ b/web/react/utils/constants.jsx @@ -61,6 +61,7 @@ module.exports = { "channel", "internal", "localhost", + "dockerhost", "stag", "post", "cluster", 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]; } |