Merge branch 'master' of github.com:MFAshby/unicornpaint

1 files changed, 2 insertions, 2 deletions

diff --git a/src/App.js b/src/App.js
index 98611b2..fe5a100 100644
--- a/src/App.js
+++ b/src/App.js
@@ -142,8 +142,8 @@ class App extends Component {
   }
 
   _connectWebsocket() {
-    // this._websocket = new WebSocket('ws://' + window.location.hostname + ':3001/ws')
-    this._websocket = new WebSocket('ws://shinypi:3001/ws')
+    let webSocketProto = window.location.protocol === "https" ? "wss" : "ws"
+    this._websocket = new WebSocket(`${webSocketProto}://${window.location.host}/ws`)
     this._websocket.onmessage = this._onMessage
     this._websocket.onopen = this._onOpen
     this._websocket.onclose = this._onClose