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

LSP: fixed issue with DVR settings box not showing up correctly + added overview save before force JSON save

Browse source
This commit is contained in:
Cat 2013-03-04 13:35:27 +01:00 • committed by Thulinma
parent 22d32fa024
commit 38f7b98a5c
1 changed files with 38 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
lsp/main.js
View file

@ -287,7 +287,19 @@
{ {
if(confirmDelete('Are you sure you want to force a JSON save?') == true) if(confirmDelete('Are you sure you want to force a JSON save?') == true)
{ {
forceJSONSave(); var host = $('#config-host').val();
var name = $('#config-name').val();
var path = $('#config-basepath').val();
settings.settings.config.host = host;
settings.settings.config.name = name;
settings.settings.config.basepath = path;
loadSettings(function()
{
forceJSONSave();
showTab('overview');
});
} }
}).text( 'force save to JSON file' ) }).text( 'force save to JSON file' )
); );
@ -844,15 +856,15 @@
sdata = settings.settings.streams[streamname]; sdata = settings.settings.streams[streamname];
title = 'edit stream "' + sdata.name + '"'; title = 'edit stream "' + sdata.name + '"';
} }
sdata = $.extend({ sdata = $.extend({
name: '', name: '',
source: '', source: '',
limits: [], limits: [],
preset: preset:
{ {
cmd: '' cmd: ''
} }
},sdata); },sdata);
$('#page').append( $('<p>').text(title) ); $('#page').append( $('<p>').text(title) );
@ -872,12 +884,16 @@
$('#stream-edit-preset').val(''); $('#stream-edit-preset').val('');
$('#stream-edit-preset').hide(); $('#stream-edit-preset').hide();
$('#stream-edit-preset-label').hide(); $('#stream-edit-preset-label').hide();
}else{
$('#stream-edit-preset').show();
$('#stream-edit-preset-label').show();
}
if(text.charAt(0) == '/')
{
$('#stream-edit-buffer').val(''); $('#stream-edit-buffer').val('');
$('#stream-edit-buffer').hide(); $('#stream-edit-buffer').hide();
$('#stream-edit-buffer-label').hide(); $('#stream-edit-buffer-label').hide();
}else{ }else{
$('#stream-edit-preset').show();
$('#stream-edit-preset-label').show();
$('#stream-edit-buffer').show(); $('#stream-edit-buffer').show();
$('#stream-edit-buffer-label').show(); $('#stream-edit-buffer-label').show();
} }
@ -902,21 +918,26 @@
) )
); );
// if the source is push or file, don't do a preset and dvr // if the source is push or file, don't do a preset
var text = $('#stream-edit-source').val(); var text = $('#stream-edit-source').val();
if(text.charAt(0) == '/' || text.substr(0, 7) == 'push://') if(text.charAt(0) == '/' || text.substr(0, 7) == 'push://')
{ {
$('#stream-edit-preset').hide(); $('#stream-edit-preset').hide();
$('#stream-edit-preset-label').hide(); $('#stream-edit-preset-label').hide();
$('#stream-edit-buffer').hide();
$('#stream-edit-buffer-label').hide();
}else{ }else{
$('#stream-edit-preset').show(); $('#stream-edit-preset').show();
$('#stream-edit-preset-label').show(); $('#stream-edit-preset-label').show();
}
//if the source is not live, don't do DVR buffer time
if(text.charAt(0) == '/')
{
$('#stream-edit-buffer').val('');
$('#stream-edit-buffer').hide();
$('#stream-edit-buffer-label').hide();
}else{
$('#stream-edit-buffer').show(); $('#stream-edit-buffer').show();
$('#stream-edit-buffer-label').show(); $('#stream-edit-buffer-label').show();
} }
$('#editserver').append( $('#editserver').append(