Comparing version 0.0.23 to 0.0.24
@@ -237,11 +237,22 @@ 'use strict'; | ||
}); | ||
rules.forEach(function (rule) { | ||
_this3.valid = rule.func(_this3.value); | ||
var ruleViolationStatuses = rules.map(function (rule) { | ||
var isValid = rule.func(_this3.value); | ||
return { | ||
rule: rule, | ||
isValid: isValid | ||
}; | ||
}); | ||
ruleViolationStatuses.forEach(function (violationStatus) { | ||
var isValid = violationStatus.isValid; | ||
var rule = violationStatus.rule; | ||
if (!_this3.valid) { | ||
if (!isValid && rule.failureMessage) { | ||
_this3.messages.push((0, _formatValidationMessage2.default)(rule.failureMessage, { name: name })); | ||
} | ||
}); | ||
this.setState(this.valid, this.messages); | ||
var allRulesSatisfied = ruleViolationStatuses.every(function (status) { | ||
return status.isValid; | ||
}); | ||
this.setState(allRulesSatisfied, this.messages); | ||
} | ||
@@ -248,0 +259,0 @@ }, { |
{ | ||
"name": "valour", | ||
"version": "0.0.23", | ||
"version": "0.0.24", | ||
"description": "Simple javascript validation for any application", | ||
@@ -5,0 +5,0 @@ "main": "lib/valour.js", |
40035
837