Improve expand/collapse logic

This commit is contained in:
Victor Dubiniuk 2013-10-11 16:35:59 +03:00
parent a2445888e8
commit 8ce3ae50f0
1 changed files with 13 additions and 16 deletions

View File

@ -9,8 +9,7 @@ $(document).ready(function() {
}; };
$('#selectDbType').buttonset(); $('#selectDbType').buttonset();
$('#datadirContent').hide(250);
$('#databaseField').hide(250);
if($('#hasSQLite').val()){ if($('#hasSQLite').val()){
$('#use_other_db').hide(); $('#use_other_db').hide();
$('#use_oracle_db').hide(); $('#use_oracle_db').hide();
@ -23,12 +22,7 @@ $(document).ready(function() {
$('#use_oracle_db').slideUp(250); $('#use_oracle_db').slideUp(250);
}); });
$('#mysql').click(function() { $('#mysql,#pgsql,#mssql').click(function() {
$('#use_other_db').slideDown(250);
$('#use_oracle_db').slideUp(250);
});
$('#pgsql').click(function() {
$('#use_other_db').slideDown(250); $('#use_other_db').slideDown(250);
$('#use_oracle_db').slideUp(250); $('#use_oracle_db').slideUp(250);
}); });
@ -38,11 +32,6 @@ $(document).ready(function() {
$('#use_oracle_db').show(250); $('#use_oracle_db').show(250);
}); });
$('#mssql').click(function() {
$('#use_other_db').slideDown(250);
$('#use_oracle_db').slideUp(250);
});
$('input[checked]').trigger('click'); $('input[checked]').trigger('click');
$('#showAdvanced').click(function() { $('#showAdvanced').click(function() {
@ -74,9 +63,17 @@ $(document).ready(function() {
form.submit(); form.submit();
return false; return false;
}); });
if(!dbtypes.sqlite){ // Expand latest db settings if page was reloaded on error
$('#showAdvanced').click(); var currentDbType = $('input[type="radio"]:checked').val();
if (currentDbType === undefined){
$('input[type="radio"]').first().click(); $('input[type="radio"]').first().click();
} }
if (currentDbType === 'sqlite' || (dbtypes.sqlite && currentDbType === undefined)){
$('#datadirContent').hide(250);
$('#databaseField').hide(250);
}
}); });