diff --git a/src/js/services/mopidy/middleware.js b/src/js/services/mopidy/middleware.js index 5426815d..5dc8a0c9 100755 --- a/src/js/services/mopidy/middleware.js +++ b/src/js/services/mopidy/middleware.js @@ -152,13 +152,8 @@ const MopidyMiddleware = (function(){ var state = store.getState(); - if (window.location.protocol == 'https'){ - var protocol = 'wss' - } else { - var protocol = 'ws' - } socket = new Mopidy({ - webSocketUrl: protocol+'://'+state.mopidy.host+':'+state.mopidy.port+'/mopidy/ws', + webSocketUrl: 'ws://'+state.mopidy.host+':'+state.mopidy.port+'/mopidy/ws', callingConvention: 'by-position-or-by-name' }); diff --git a/src/js/services/pusher/middleware.js b/src/js/services/pusher/middleware.js index 12c3c5d1..64990a5b 100755 --- a/src/js/services/pusher/middleware.js +++ b/src/js/services/pusher/middleware.js @@ -72,14 +72,8 @@ const PusherMiddleware = (function(){ if( state.pusher.username ) connection.username = state.pusher.username; connection.username = connection.username.replace(/\W/g, '') - if (window.location.protocol == 'https'){ - var protocol = 'wss' - } else { - var protocol = 'ws' - } - socket = new WebSocket( - protocol+'://'+state.mopidy.host+':'+state.mopidy.port+'/iris/ws', + 'ws://'+state.mopidy.host+':'+state.mopidy.port+'/iris/ws', [ connection.clientid, connection.connection_id, connection.username ] );