From: Marc Plano-Lesay Date: Thu, 7 Jul 2016 13:22:15 +0000 (+0200) Subject: Fix double slashes in websocket URL X-Git-Url: http://gitweb.hugovil.com/?a=commitdiff_plain;h=15edcc645c231d91d92dad93c6809c3b847ebdf7;p=ympd.git Fix double slashes in websocket URL --- diff --git a/htdocs/js/mpd.js b/htdocs/js/mpd.js index 6000b79..1356cef 100644 --- a/htdocs/js/mpd.js +++ b/htdocs/js/mpd.js @@ -525,6 +525,7 @@ function get_appropriate_ws_url() { var pcol; var u = document.URL; + var separator; /* /* We open the websocket encrypted if this page came on an @@ -542,7 +543,13 @@ function get_appropriate_ws_url() u = u.split('#'); - return pcol + u[0] + "/ws"; + if (/\/$/.test(u[0])) { + separator = ""; + } else { + separator = "/"; + } + + return pcol + u[0] + separator + "ws"; } var updateVolumeIcon = function(volume)