LSP: fixed issue with DVR settings box not showing up correctly + added overview save before force JSON save
This commit is contained in:
parent
22d32fa024
commit
38f7b98a5c
1 changed files with 38 additions and 17 deletions
33
lsp/main.js
33
lsp/main.js
|
@ -286,8 +286,20 @@
|
|||
$('<button>').click(function()
|
||||
{
|
||||
if(confirmDelete('Are you sure you want to force a JSON save?') == true)
|
||||
{
|
||||
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' )
|
||||
);
|
||||
|
@ -872,12 +884,16 @@
|
|||
$('#stream-edit-preset').val('');
|
||||
$('#stream-edit-preset').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').hide();
|
||||
$('#stream-edit-buffer-label').hide();
|
||||
}else{
|
||||
$('#stream-edit-preset').show();
|
||||
$('#stream-edit-preset-label').show();
|
||||
$('#stream-edit-buffer').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();
|
||||
|
||||
if(text.charAt(0) == '/' || text.substr(0, 7) == 'push://')
|
||||
{
|
||||
$('#stream-edit-preset').hide();
|
||||
$('#stream-edit-preset-label').hide();
|
||||
$('#stream-edit-buffer').hide();
|
||||
$('#stream-edit-buffer-label').hide();
|
||||
}else{
|
||||
$('#stream-edit-preset').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-label').show();
|
||||
|
||||
}
|
||||
|
||||
$('#editserver').append(
|
||||
|
|
Loading…
Add table
Reference in a new issue