// Improve ajax request in new installer

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11822 b9a71923-0436-4b27-9f14-aed3839534dd

install-new/theme/js/database.js

@@ -6,12 +6,15 @@ $(document).ready(function()
 		$("#dbResultCheck").slideUp('slow');
 		$.ajax({
 			url: 'index.php',
-			data: 'checkDb=true&dbServer='+$('#dbServer').val()
+			data: {
-					+'&dbName='+$('#dbName').val()
+                'checkDb': 'true',
-					+'&dbLogin='+$('#dbLogin').val()
+                'dbServer': $('#dbServer').val(),
-					+'&dbPassword='+$('#dbPassword').val()
+                'dbName': $('#dbName').val(),
-					+'&dbEngine='+$('#dbEngine').val()
+                'dbLogin': $('#dbLogin').val(),
-					+'&db_prefix='+$('#db_prefix').val(),
+                'dbPassword': $('#dbPassword').val(),
+                'dbEngine': $('#dbEngine').val(),
+                'db_prefix': $('#db_prefix').val()
+            },
 			dataType: 'json',
 			cache: false,
 			success: function(json)
@@ -21,6 +24,14 @@ $(document).ready(function()
 					.removeClass((json.success) ? 'errorBlock' : 'okBlock')
 					.html(json.message)
 					.slideDown('slow');
+			},
+            error: function(xhr)
+            {
+                $("#dbResultCheck")
+                    .addClass('errorBlock')
+                    .removeClass('okBlock')
+                    .html('An error occurred:<br /><br />'+xhr.responseText)
+                    .slideDown('slow');
             }
 		});
 	});
@@ -43,13 +54,17 @@ $(document).ready(function()
 		$("#mailResultCheck").slideUp('slow');
 		$.ajax({
 			url: 'index.php',
-			data: 'sendMail=true&smtpSrv='+$('#smtpSrv').val()
+			data: {
-					+'&smtpEnc='+$('#smtpEnc').val()
+                'sendMail': 'true',
-					+'&smtpPort='+$('#smtpPort').val()
+                'smtpSrv': $('#smtpSrv').val(),
-					+'&smtpLogin='+$('#smtpLogin').val()
+                'smtpEnc': $('#smtpEnc').val(),
-					+'&smtpPassword='+$('#smtpPassword').val()
+                'smtpPort': $('#smtpPort').val(),
-					+'&testEmail='+$('#testEmail').val()
+                'smtpLogin': $('#smtpLogin').val(),
-					+'&smtpChecked='+($('#set_stmp').attr('checked') ? 'true' : 'false'),
+                'smtpPassword': $('#smtpPassword').val(),
+                'testEmail': $('#smtpSrv').val(),
+                'testEmail': $('#testEmail').val(),
+                'smtpChecked': ($('#set_stmp').attr('checked') ? 'true' : 'false')
+            },
 			dataType: 'json',
 			cache: false,
 			success: function(json)
@@ -59,6 +74,14 @@ $(document).ready(function()
 					.removeClass((json.success) ? 'errorBlock' : 'infosBlock')
 					.html(json.message)
 					.slideDown('slow');
+			},
+            error: function(xhr)
+            {
+                $("#mailResultCheck")
+                    .addClass('errorBlock')
+                    .removeClass('infosBlock')
+                    .html('An error occurred:<br /><br />'+xhr.responseText)
+                    .slideDown('slow');
             }
 		});
 	});