projects
/
ympd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ec008a4
)
Fix double slashes in websocket URL
author
Marc Plano-Lesay
<kernald@enoent.fr>
Thu, 7 Jul 2016 13:22:15 +0000
(15:22 +0200)
committer
Marc Plano-Lesay
<kernald@enoent.fr>
Thu, 7 Jul 2016 13:22:15 +0000
(15:22 +0200)
htdocs/js/mpd.js
patch
|
blob
|
history
diff --git
a/htdocs/js/mpd.js
b/htdocs/js/mpd.js
index
6000b79
..
1356cef
100644
(file)
--- 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)