Merge branch 'master' of https://github.com/janza/Iris into janza-master

2017-03-28 05:47:05 +13:00
parent 11198f18c7 7452c743ba
commit 0c971658a5
1 changed files with 2 additions and 2 deletions
--- a/src/js/services/pusher/middleware.js
+++ b/src/js/services/pusher/middleware.js
@ -73,7 +73,7 @@ const PusherMiddleware = (function(){
                connection.username = connection.username.replace(/\W/g, '')
                
                socket = new WebSocket(
-                    'ws://'+state.mopidy.host+':'+state.mopidy.port+'/iris/ws',
+                    'ws'+(window.location.protocol === 'https:' ? 's' : '')+'://'+state.mopidy.host+':'+state.mopidy.port+'/iris/ws',
                    [ connection.clientid, connection.connection_id, connection.username ]
                );

@ -344,4 +344,4 @@ const PusherMiddleware = (function(){

 })();

-export default PusherMiddleware
+export default PusherMiddleware