MontoyaTech/ignite-html-validate
MontoyaTech/ignite-html-validate
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Simplified validate function. Removed validateAll function, merged into validate function. Cleaned up code.

Browse Source
This commit is contained in:
MattMo 2021-12-28 22:34:36 -08:00
parent 368f713dba
commit bf7bd34567
1 changed files with 40 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
ignite-html-validate.js
View File

@ -157,16 +157,6 @@ function notify(target, type, msg, duration) {
} }
} }
}); });
//Setup a constructor to create a validate function on the created element.
this._constructors.push(() => this.element.validate = () => {
for (var i = 0; i < this._validators.length; i++) {
if (!this._validators[i]()) {
return false;
}
}
return true;
});
} }
//Register a new validator //Register a new validator
@ -206,7 +196,9 @@ function notify(target, type, msg, duration) {
*/ */
IgniteTemplate.prototype.validateEmail = function (msg) { IgniteTemplate.prototype.validateEmail = function (msg) {
return this.validate((value, error) => { return this.validate((value, error) => {
if (!value || value.trim().length < 5) { if (!value || value.length == 0) {
return error(msg ? msg : `Please enter an email address.`);
} else if (value.trim().length < 5) {
return error(msg ? msg : `Email address too short.`); return error(msg ? msg : `Email address too short.`);
} else if (!value.includes('@')) { } else if (!value.includes('@')) {
return error(msg ? msg : 'Email address missing @ symbol.'); return error(msg ? msg : 'Email address missing @ symbol.');
@ -316,15 +308,33 @@ function notify(target, type, msg, duration) {
} }
/** /**
* Validates all the children of an element and returns if they are valid or not. * Validates this element and all the children within the element.
* @returns {Boolean} Whether or not all the children of this element are valid. * @returns {Boolean} Whether or not this element and all children in this element are valid.
*/ */
HTMLElement.prototype.validateAll = function() { HTMLElement.prototype.validate = function () {
var elements = this.getElementsByTagName("*"); //If this element has a template with validators run them.
for (var i = 0; i < elements.length; i++) { if (this.template && this.template._validators) {
if (elements[i].validate != undefined && !elements[i].validate()) { for (var i = 0; i < this.template._validators.length; i++) {
if (!this.template._validators[i]()) {
return false; return false;
} }
} }
} else {
//Look for elements that we can try to validate.
var elements = this.getElementsByTagName("*");
for (var i = 0; i < elements.length; i++) {
var element = elements[i];
//If this element has a template, and has validators, run them, if any are false, return false.
if (element.template && element.template._validators) {
for (var v = 0; v < element.template._validators.length; v++) {
if (!element.template._validators[v]()) {
return false;
}
}
}
}
}
return true; return true;
} }