TouchInstinct
/
formsy-react
302
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

`getErrorMessages` should return empty array when there are no errors

This commit is contained in:
Semigradsky 2015-07-09 12:53:26 +03:00
parent 89759fefde
commit 357f4adf71
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Mixin.js
View File

@ -140,10 +140,11 @@ module.exports = {
return this.state._value !== '';
},
getErrorMessage: function () {
return this.getErrorMessages() && this.getErrorMessages()[0];
var messages = this.getErrorMessages();
return messages.length ? messages[0] : null;
},
getErrorMessages: function () {
return !this.isValid() || this.showRequired() ? (this.state._externalError || this.state._validationError) : null;
return !this.isValid() || this.showRequired() ? (this.state._externalError || this.state._validationError || []) : [];
},
isFormDisabled: function () {
return this.context.formsy.isFormDisabled();

3
src/main.js
View File

@ -317,7 +317,8 @@ Formsy.Form = React.createClass({
}
if (isRequired) {
return [validationErrors[requiredResults.success[0]]] || null;
var error = validationErrors[requiredResults.success[0]];
return error ? [error] : null;
}
if (validationResults.failed.length) {