Rebasing middleware pre-merge

2017-03-28 05:46:22 +13:00
parent d85f3012f4
commit 889501332c
2 changed files with 2 additions and 13 deletions
--- 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'
                });