Fix showing multiple error messages

christianalfoni · Jul 9, 2015 · 89759fe · 89759fe
1 parent 9e5723c
commit 89759fe
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/main.js b/src/main.js
@@ -320,8 +320,13 @@ Formsy.Form = React.createClass({
           return [validationErrors[requiredResults.success[0]]] || null;
         }
 
-        if (!isValid) {
-          return [validationError];
+        if (validationResults.failed.length) {
+          return validationResults.failed.map(function(failed) {
+            return validationErrors[failed] ? validationErrors[failed] : validationError;
+          }).filter(function(x, pos, arr) {
+            // Remove duplicates
+            return arr.indexOf(x) === pos;
+          });
         }
 
       }.call(this))