Improve expand/collapse logic

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