Merge e8abae4 into c22d5a7

romm · Jul 17, 2018 · 101b69a · 101b69a
2 parents c22d5a7 + e8abae4
commit 101b69a
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/Resources/Public/JavaScript/Field/Formz.Field.ValidationService.js b/Resources/Public/JavaScript/Field/Formz.Field.ValidationService.js
@@ -138,13 +138,14 @@ Fz.Field.ValidationService = (function () {
         /**
          * Internal recursive function to validate the field.
          *
-         * @param {Object}        validationRules     The validation rules which are checked.
-         * @param {Array}         validationRulesKeys Keys of the remaining validation rules to check (used for recursive behaviour).
+         * @param {Object}               validationRules     The validation rules which are checked.
+         * @param {Array}                validationRulesKeys Keys of the remaining validation rules to check (used for recursive behaviour).
+         * @param {Formz.ResultInstance} result
          */
-        var launchValidation = function (validationRules, validationRulesKeys) {
+        var launchValidation = function (validationRules, validationRulesKeys, result) {
             var validatorName = validationRulesKeys[0];
             var validationRule = validationRules[validatorName];
-            var result = Fz.Result.get({defaultErrorMessage: defaultErrorMessage});
+            result = result || Fz.Result.get({defaultErrorMessage: defaultErrorMessage});
             var finalValidationCallback = function () {
                 handleValidationResult(validatorName, result);
             };
@@ -153,13 +154,13 @@ Fz.Field.ValidationService = (function () {
                 /** @type {validationResultCallback} */
                 var callback;
 
-                callback = function (result) {
-                    if (false === result.hasErrors()
+                callback = function (freshResult) {
+                    if (false === freshResult.hasErrors()
                         && validationRulesKeys.length > 1
                     ) {
                         // Handling the remaining rules.
                         validationRulesKeys.splice(0, 1);
-                        launchValidation(validationRules, validationRulesKeys);
+                        launchValidation(validationRules, validationRulesKeys, result);
                     } else {
                         // The result has errors, or no more rule to check: the checks stop and the result is handled.
                         finalValidationCallback();
@@ -186,7 +187,7 @@ Fz.Field.ValidationService = (function () {
                 if (validationRulesKeys.length > 1) {
                     // Handling the remaining rules.
                     validationRulesKeys.splice(0, 1);
-                    launchValidation(validationRules, validationRulesKeys);
+                    launchValidation(validationRules, validationRulesKeys, result);
                 } else {
                     // No more rule to check: the checks stop.
                     finalValidationCallback();