From f1ba9d417e595d003c9df3d43b9627297eab49b6 Mon Sep 17 00:00:00 2001 From: Aesop Wolf Date: Mon, 23 Jan 2017 19:13:05 -0800 Subject: [PATCH] Revert "fix: show the default validation message when there is a required error (#386)" This reverts commit ac301f89508ee3d0fca15f037d56fcf916c99abb. --- src/Mixin.js | 2 +- src/main.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Mixin.js b/src/Mixin.js index 4568815..d615fc7 100644 --- 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 index 6043583..f7b5e8e 100644 --- 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; }