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

LSP: lots of fixes

Browse source
This commit is contained in:
Cat 2013-04-23 13:28:56 +02:00 • committed by Thulinma
parent 353d58e98f
commit 5bc15ea794
3 changed files with 207 additions and 205 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
lsp/functions.js
View file

File diff suppressed because one or more lines are too long

49
lsp/main.js
View file

@ -28,7 +28,6 @@
*/ */
var ltypes = var ltypes =
[ [
['kb_total', 'Total bandwidth'],
['kbps_max', 'Current bandwidth'], ['kbps_max', 'Current bandwidth'],
['users', 'Concurrent users'], ['users', 'Concurrent users'],
['geo', 'Geolimited'], ['geo', 'Geolimited'],
@ -36,6 +35,7 @@
]; ];
/* Not currently supported but may return at a later time: /* Not currently supported but may return at a later time:
['kb_total', 'Total bandwidth'],
['duration', 'Duration'], ['duration', 'Duration'],
['str_kbps_min', 'Minimum bitrate'], ['str_kbps_min', 'Minimum bitrate'],
['str_kbps_max', 'Maximum bitrate'] ['str_kbps_max', 'Maximum bitrate']
@ -1063,20 +1063,19 @@
$table.html("<thead><th>Hard/soft</th><th>Type</th><th>Value</th><th>Applies to</th><th>Action</th></thead>"); $table.html("<thead><th>Hard/soft</th><th>Type</th><th>Value</th><th>Applies to</th><th>Action</th></thead>");
$tbody = $('<tbody>'); $tbody = $('<tbody>');
var i, tr, limit, stream, clims, var i, tr, limit, stream, currentlims,
alllimits = settings.settings.config.limits; alllimits = settings.settings.config.limits;
for(stream in settings.settings.streams) for(stream in settings.settings.streams)
{ {
clims = settings.settings.streams[stream].limits; currentlims = settings.settings.streams[stream].limits;
$.each(clims, function(k, v) for (index in currentlims) {
{ currentlims[index].appliesto = stream;
this.appliesto = stream; currentlims[index].appliesi = index;
this.appliesi = k; }
});
alllimits = alllimits.concat(clims); alllimits = alllimits.concat(currentlims);
} }
len = alllimits.length; len = alllimits.length;
@ -1090,14 +1089,42 @@
limit = alllimits[i]; limit = alllimits[i];
$tbody.append(BuildLimitRow(limit)); $tbody.append(BuildLimitRow(limit));
} }
for (stream in settings.settings.streams) {
for (limit in settings.settings.streams[stream].limits) {
delete settings.settings.streams[stream].limits[limit].appliesto;
delete settings.settings.streams[stream].limits[limit].appliesi
}
}
$table.append($tbody); $table.append($tbody);
$('#page').append($table); $('#page').append($table);
//tooltip
$('.limits_type').add('.limits_name').hover(function(e){
removeTooltip();
showTooltip(e,undefined,$(this).children(':selected').data('desc'));
},function(){
removeTooltip();
});
//change limit value box on type change
$('.limits_name').change(function(){
var value = $(this).parents('.limits_row').find(".limits_val").val();
$(this).parents('.limits_row').children('.limit_input_container').html('');
BuildLimitRowInput(
$(this).parents('.limits_row').children('.limit_input_container'),
{
'name': $(this).parents('.limits_row').find(".limits_name").val(),
'type': $(this).parents('.limits_row').find(".limits_type").val(),
'val': value
}
);
});
//build buttons //build buttons
$('#page').append( $('#page').append(
$('<button>').text('Add limit').click(function(){ $('<button>').text('Add limit').click(function(){
$tbody.append(BuildLimitRow({"name":"kb_total", "val":0, "type":"soft"})); $tbody.append(BuildLimitRow({"name":"kbps_max", "val":0, "type":"soft"}));
}) })
).append($('<br>')).append( ).append($('<br>')).append(
$('<button>').text('Save all').click(function(){ $('<button>').text('Save all').click(function(){
@ -1139,8 +1166,10 @@
} }
if($(this).find('.new-limit-appliesto').val() == 'server') { if($(this).find('.new-limit-appliesto').val() == 'server') {
settings.settings.config.limits.push(obj); settings.settings.config.limits.push(obj);
console.log('new server limit',obj);
}else{ }else{
settings.settings.streams[$(this).find('.new-limit-appliesto').val()].limits.push(obj); settings.settings.streams[$(this).find('.new-limit-appliesto').val()].limits.push(obj);
console.log('new stream limit',$(this).find('.new-limit-appliesto').val(),obj);
} }
}); });
loadSettings(function(){ loadSettings(function(){

3
src/connectors/embed.js
View file

@ -118,6 +118,9 @@ function mistembed(streamname)
scripts = document.getElementsByTagName('script'), scripts = document.getElementsByTagName('script'),
me = scripts[scripts.length - 1]; me = scripts[scripts.length - 1];
if (video.width == 0) { video.width = 250; }
if (video.height == 0) { video.height = 250; }
// create the container // create the container
me.parentNode.insertBefore(container, me); me.parentNode.insertBefore(container, me);
// set the class to 'mistvideo' // set the class to 'mistvideo'