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

Merge branch 'development' into LTS_development

Browse source
This commit is contained in:
Thulinma 2015-10-20 11:39:57 +02:00
commit 58d4015af2
3 changed files with 58 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
lsp/server_screenlog.html Normal file
View file

File diff suppressed because one or more lines are too long

2
lsp/test_streamembed.html
View file

@ -14,7 +14,7 @@
var embedtype = $('input[name=force]').val(); var embedtype = $('input[name=force]').val();
var info = document.createElement('script'); var info = document.createElement('script');
info.src = 'http://'+window.location.hostname+':8080/info_'+streamName+'.js'; info.src = 'http://'+(window.location.hostname == '' ? 'localhost' : window.location.hostname)+':8080/info_'+streamName+'.js';
document.getElementById('embedcontainer').appendChild(info); document.getElementById('embedcontainer').appendChild(info);
info.onload = function(){ info.onload = function(){
if (embedtype == '') { if (embedtype == '') {

18
src/embed.js
View file

@ -1,4 +1,18 @@
function mistembed(streamname) { function mistembed(streamname) {
//find the current script
var me;
if (('currentScript' in document) && (document.currentScript)) {
me = document.currentScript;
//not supported in old browsers :(
}
else {
var scripts = document.getElementsByTagName('script');
me = scripts[scripts.length - 1];
//not correct if the script is inserted dynamically, but this is how it used to be
}
// return the current flash version // return the current flash version
function flash_version() { function flash_version() {
var version = 0; var version = 0;
@ -201,9 +215,7 @@ function mistembed(streamname) {
} }
var video = mistvideo[streamname], var video = mistvideo[streamname],
container = document.createElement('div'), container = document.createElement('div');
scripts = document.getElementsByTagName('script'),
me = scripts[scripts.length - 1];
if (me.parentNode.hasAttribute('data-forcetype')) { if (me.parentNode.hasAttribute('data-forcetype')) {
var forceType = me.parentNode.getAttribute('data-forcetype'); var forceType = me.parentNode.getAttribute('data-forcetype');