Merge branch 'development' into LTS_development

This commit is contained in:
Thulinma 2015-11-24 15:20:40 +01:00
commit d887e01aed
4 changed files with 77 additions and 41 deletions

View file

@ -215,16 +215,23 @@ function mistembed(streamname) {
}
var video = mistvideo[streamname],
container = document.createElement('div');
container = document.createElement('div'),
forceType = false,
forceSupportCheck = false,
autoplay = false,
urlappend = false;
if (me.parentNode.hasAttribute('data-forcetype')) {
var forceType = me.parentNode.getAttribute('data-forcetype');
forceType = me.parentNode.getAttribute('data-forcetype');
}
if (me.parentNode.hasAttribute('data-forcesupportcheck')) {
var forceSupportCheck = true;
forceSupportCheck = true;
}
if (me.parentNode.hasAttribute('data-autoplay')) {
var autoplay = true;
autoplay = true;
}
if (me.parentNode.hasAttribute('data-urlappend')) {
urlappend = me.parentNode.getAttribute('data-urlappend');
}
if (video.width == 0) { video.width = 250; }
@ -281,7 +288,19 @@ function mistembed(streamname) {
}
else {
// we support this kind of video, so build it.
buildPlayer(video.source[foundPlayer], container, video.width, video.height, vtype);
var source = video.source[foundPlayer];
if (urlappend) {
source.url += urlappend;
source.relurl += urlappend;
}
else if (me.src.indexOf('?') != -1) {
var params = me.src.split('?');
params.shift();
params.join('?');
source.url += '?'+params;
source.relurl += '?'+params;
}
buildPlayer(source, container, video.width, video.height, vtype);
}
}