various fixes to both LSP and Embed
Embed: - pass urlappend to streaminfo request - updated videojs from 5.18 to 6.2 LSP: - mail for help should use https now
This commit is contained in:
parent
6d34de94f5
commit
ff7d784449
7 changed files with 44590 additions and 33 deletions
|
@ -1383,7 +1383,7 @@ function mistPlay(streamName,options) {
|
|||
else {
|
||||
//get info js
|
||||
var info = document.createElement('script');
|
||||
info.src = options.host+'/info_'+encodeURIComponent(streamName)+'.js';
|
||||
info.src = options.host+'/info_'+encodeURIComponent(streamName)+'.js'+(('urlappend' in options) && (options.urlappend) ? options.urlappend : '' );
|
||||
embedLog('Retrieving stream info from '+info.src);
|
||||
document.head.appendChild(info);
|
||||
info.onerror = function(){
|
||||
|
|
24722
embed/players/video.js
Normal file
24722
embed/players/video.js
Normal file
File diff suppressed because it is too large
Load diff
19
embed/players/video.min.js
vendored
19
embed/players/video.min.js
vendored
File diff suppressed because one or more lines are too long
19848
embed/players/videojs-contrib-hls.js
Normal file
19848
embed/players/videojs-contrib-hls.js
Normal file
File diff suppressed because it is too large
Load diff
14
embed/players/videojs-contrib-hls.min.js
vendored
14
embed/players/videojs-contrib-hls.min.js
vendored
File diff suppressed because one or more lines are too long
|
@ -190,7 +190,7 @@ mist.data.capabilities.cpu[g],f.content.push({header:"CPU #"+(Number(g)+1),body:
|
|||
100),UI.format.number(b.fifteen/100)]}]};b=UI.buildVheaderTable(b);E.replaceWith(b);E=b};ra();d.append(UI.buildUI([{type:"help",help:"You can find general server statistics here. Note that memory and CPU usage is for your entire machine, not just MistServer."}])).append($("<table>").css("width","auto").addClass("nolay").append($("<tr>").append($("<td>").append(fa)).append($("<td>").append(E))).append($("<tr>").append($("<td>").append(g).attr("colspan",2))));UI.interval.set(function(){mist.send(function(){ra()},
|
||||
{capabilities:true})},3E4);break;case "Email for Help":g=$.extend({},mist.data);delete g.statistics;delete g.totals;delete g.clients;delete g.capabilities;g=JSON.stringify(g);g="Version: "+mist.data.config.version+"\n\nConfig:\n"+g;n={};d.append(UI.buildUI([{type:"help",help:"You can use this form to email MistServer support if you're having difficulties.<br>A copy of your server config file will automatically be included."},{type:"str",label:"Your name",validate:["required"],pointer:{main:n,index:"name"},
|
||||
value:mist.user.name},{type:"email",label:"Your email address",validate:["required"],pointer:{main:n,index:"email"}},{type:"hidden",value:"Integrated Help",pointer:{main:n,index:"subject"}},{type:"hidden",value:"-",pointer:{main:n,index:"company"}},{type:"textarea",rows:20,label:"Your message",validate:["required"],pointer:{main:n,index:"message"}},{type:"textarea",rows:20,label:"Your config file",readonly:!0,value:g,pointer:{main:n,index:"configfile"}},{type:"buttons",buttons:[{type:"save",label:"Send",
|
||||
"function":function(a){$(a).text("Sending..");$.ajax({type:"POST",url:"http://mistserver.org/contact?skin=plain",data:n,success:function(a){a=$("<span>").html(a);a.find("script").remove();d.html(a[0].innerHTML)}})}}]}]));break;case "Disconnect":mist.user.password="";delete mist.user.authstring;delete mist.user.loggedin;sessionStorage.removeItem("mistLogin");UI.navto("Login");break;default:d.append($("<p>").text("This tab does not exist."))}d.find(".field").filter(function(){var a=$(this).getval();
|
||||
"function":function(a){$(a).text("Sending..");$.ajax({type:"POST",url:"https://mistserver.org/contact?skin=plain",data:n,success:function(a){a=$("<span>").html(a);a.find("script").remove();d.html(a[0].innerHTML)}})}}]}]));break;case "Disconnect":mist.user.password="";delete mist.user.authstring;delete mist.user.loggedin;sessionStorage.removeItem("mistLogin");UI.navto("Login");break;default:d.append($("<p>").text("This tab does not exist."))}d.find(".field").filter(function(){var a=$(this).getval();
|
||||
return a==""||a==null?true:false}).each(function(){var a=[];$(this).is("input, select, textarea")?a.push($(this)):a=$(this).find("input, select, textarea");if(a.length){$(a[0]).focus();return false}});!navigator.doNotTrack&&mist.user.loggedin&&d.append($("<img>").attr("src","https://www.google-analytics.com/collect?v=1&tid=UA-32426932-1&cid="+mist.data.config.iid+"&t=pageview&dp="+encodeURIComponent("/MI/"+a)+"&dh=MI."+(mist.data.LTS?"Pro":"OS")).css({width:"1px",height:"1px","min-width":"1px",opacity:0.1,
|
||||
position:"absolute",left:"-1000px"}))}}};"origin"in location||(location.origin=location.protocol+"//");var host;host="file://"==location.origin?"http://localhost:4242/api":location.origin+location.pathname.replace(/\/+$/,"")+"/api";
|
||||
var mist={data:{},user:{name:"",password:"",host:host},send:function(a,c,d){var c=c||{},d=d||{},d=$.extend(true,{timeOut:3E4,sendData:c},d),b={authorize:{password:mist.user.authstring?MD5(mist.user.password+mist.user.authstring):"",username:mist.user.name}};$.extend(true,b,c);log("Send",$.extend(true,{},c));b={url:mist.user.host,type:"POST",data:{command:JSON.stringify(b)},dataType:"jsonp",crossDomain:true,timeout:d.timeout*1E3,async:true,error:function(b,e){delete mist.user.loggedin;if(!d.hide){switch(e){case "timeout":e=
|
||||
|
|
16
lsp/mist.js
16
lsp/mist.js
|
@ -2829,20 +2829,6 @@ var UI = {
|
|||
var i = 0;
|
||||
$tbody.html('');
|
||||
|
||||
/*if (mist.data.LTS) {
|
||||
//insert active wildcard streams (should overwrite active folder wildcard streams)
|
||||
for (var i in mist.data.active_streams) {
|
||||
var streamsplit = mist.data.active_streams[i].split('+');
|
||||
if (streamsplit.length < 2) { continue; }
|
||||
if (streamsplit[0] in mist.data.streams) {
|
||||
var wcstream = createWcStreamObject(mist.data.active_streams[i],mist.data.streams[streamsplit[0]]);
|
||||
wcstream.online = 1; //it's in active_streams, so it's active. Go figure.
|
||||
allstreams[mist.data.active_streams[i]] = wcstream;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
var streams = Object.keys(allstreams);*/
|
||||
streams.sort();
|
||||
for (var s in streams) {
|
||||
var streamname = streams[s];
|
||||
|
@ -5413,7 +5399,7 @@ var UI = {
|
|||
$(me).text('Sending..');
|
||||
$.ajax({
|
||||
type: 'POST',
|
||||
url: 'http://mistserver.org/contact?skin=plain',
|
||||
url: 'https://mistserver.org/contact?skin=plain',
|
||||
data: saveas,
|
||||
success: function(d) {
|
||||
var $s = $('<span>').html(d);
|
||||
|
|
Loading…
Add table
Reference in a new issue