Skip to content

Commit

Permalink
Streamline validator checks.
Browse files Browse the repository at this point in the history
  • Loading branch information
RillingDev committed Mar 15, 2021
1 parent f6e7fc3 commit 50e70d8
Showing 1 changed file with 3 additions and 10 deletions.
13 changes: 3 additions & 10 deletions src/Ok.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,25 +37,18 @@ export class Ok {
*/
private validate(element: ValidatableElement, e?: Event): boolean {
const value = getValidatableElementValue(element);
let valid = true;
for (const validator of this.getValidators(element)) {
if (!valid) {
break;
}
if (!validator.fn(value, element, e)) {
valid = false;
const msg =
typeof validator.msg === "function"
? validator.msg(value, element, e)
: validator.msg;
element.setCustomValidity(msg);
return false;
}
}
if (valid) {
element.setCustomValidity("");
}

return valid;
element.setCustomValidity("");
return true;
}

private getValidators(element: ValidatableElement): Validator[] {
Expand Down

0 comments on commit 50e70d8

Please sign in to comment.