summaryrefslogtreecommitdiffstats
path: root/web/react/stores
diff options
context:
space:
mode:
author=Corey Hulen <corey@hulen.com>2016-01-22 16:31:58 -0600
committer=Corey Hulen <corey@hulen.com>2016-01-22 16:31:58 -0600
commitc2d98c2c1f4860c11aedf43aff5e360256a89835 (patch)
tree4304f7584025477d74e5e70677c4f5a70c26bb58 /web/react/stores
parent6e2c1b7fd5248c6a4a91edcd59fa124c8d3c744a (diff)
parentd352c5b64dddfb8e46b18edbd7352c41495078a1 (diff)
downloadchat-c2d98c2c1f4860c11aedf43aff5e360256a89835.tar.gz
chat-c2d98c2c1f4860c11aedf43aff5e360256a89835.tar.bz2
chat-c2d98c2c1f4860c11aedf43aff5e360256a89835.zip
merging
Diffstat (limited to 'web/react/stores')
-rw-r--r--web/react/stores/socket_store.jsx2
1 files changed, 1 insertions, 1 deletions
diff --git a/web/react/stores/socket_store.jsx b/web/react/stores/socket_store.jsx
index 24fa79ca6..f1fade305 100644
--- a/web/react/stores/socket_store.jsx
+++ b/web/react/stores/socket_store.jsx
@@ -49,7 +49,7 @@ class SocketStoreClass extends EventEmitter {
protocol = 'wss://';
}
- var connUrl = protocol + location.host + '/api/v1/websocket?' + Utils.getSessionIndex();
+ var connUrl = protocol + location.host + ((/:\d+/).test(location.host) ? '' : Utils.getWebsocketPort(protocol)) + '/api/v1/websocket?' + Utils.getSessionIndex();
if (this.failCount === 0) {
console.log('websocket connecting to ' + connUrl); //eslint-disable-line no-console