Revert "fix: show the default validation message when there is a required error (christianalfoni#386)"

aesopwolf · aesopwolf · commit f1ba9d417e59 · 2017-01-23T19:13:05.000-08:00
This reverts commit ac301f8.
diff --git a/src/Mixin.js b/src/Mixin.js
@@ -166,7 +166,7 @@ module.exports = {
     return this.state._isRequired;
   },
   showError: function () {
-    return this.showRequired() && !this.isValid();
+    return !this.showRequired() && !this.isValid();
   },
   isValidValue: function (value) {
     return this.context.formsy.isValidValue.call(null, this, value);
diff --git a/src/main.js b/src/main.js
@@ -278,7 +278,7 @@ Formsy.Form = React.createClass({
         }
 
         if (isRequired) {
-          var error = validationErrors[requiredResults.success[0]] || validationError;
+          var error = validationErrors[requiredResults.success[0]];
           return error ? [error] : null;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -278,7 +278,7 @@ Formsy.Form = React.createClass({`
`278`	`278`	`}`
`279`	`279`
`280`	`280`	`if (isRequired) {`
`281`		`- var error = validationErrors[requiredResults.success[0]] \|\| validationError;`
	`281`	`+ var error = validationErrors[requiredResults.success[0]];`
`282`	`282`	`return error ? [error] : null;`
`283`	`283`	`}`
`284`	`284`