hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

LSP/embed: fix for + in filenames in folder streams

Browse source
This commit is contained in:
cat 2016-07-21 11:35:00 +02:00 • committed by Thulinma
parent e1fac6248e
commit b7c37ba60d
3 changed files with 18 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/embed.js
View file

@ -189,7 +189,7 @@ function mistembed(streamname) {
break;
case 'html5':
container.innerHTML += '<video width="' + videowidth + '" height="' + videoheight + '" src="' + encodeURI(src.url) + '" controls="controls" '+(autoplay ? 'autoplay="autoplay"' : '')+'><strong>No HTML5 video support</strong></video>';
container.innerHTML += '<video width="' + videowidth + '" height="' + videoheight + '" src="' + src.url + '" controls="controls" '+(autoplay ? 'autoplay="autoplay"' : '')+'><strong>No HTML5 video support</strong></video>';
break;
case 'rtsp':
@ -264,11 +264,19 @@ function mistembed(streamname) {
if(video.error) {
// there was an error; display it
container.innerHTML = ['<strong>Error: ', video.error, '</strong>'].join('');
if (video.on_error){
container.innerHTML = video.on_error;
}else{
container.innerHTML = ['<strong>Error: ', video.error, '</strong>'].join('');
}
}
else if ((typeof video.source == 'undefined') || (video.source.length < 1)) {
// no stream sources
container.innerHTML = '<strong>Error: no protocols found</strong>';
if (video.on_error){
container.innerHTML = video.on_error;
}else{
container.innerHTML = '<strong>Error: no active source or compatible protocols for this stream</strong>';
}
}
else {
// no error, and sources found. Check the video types and output the best