updated parseField workflow
This commit is contained in:
@ -263,30 +263,28 @@ class Validation {
|
||||
parseField(fieldInstance) {
|
||||
const nameAttrVal = fieldInstance.el.name
|
||||
|
||||
this.validateForBlank(fieldInstance)
|
||||
if (this.validateForBlank(fieldInstance)) {
|
||||
switch (fieldInstance.el.type) {
|
||||
case 'checkbox':
|
||||
this.validateCheckbox(fieldInstance, nameAttrVal)
|
||||
break
|
||||
case 'email':
|
||||
this.validateEmail(fieldInstance)
|
||||
break
|
||||
case 'password':
|
||||
if (fieldInstance.el.name === 'password') this.validatePassword(fieldInstance)
|
||||
if (fieldInstance.el.name === 'password-confirm') this.validateConfirmPass(fieldInstance)
|
||||
break
|
||||
case 'radio':
|
||||
this.validateRadio(fieldInstance, nameAttrVal)
|
||||
break
|
||||
case 'tel':
|
||||
this.validateTel(fieldInstance)
|
||||
break
|
||||
}
|
||||
|
||||
if (fieldInstance.el.value) {
|
||||
if (fieldInstance.pattern) {
|
||||
if (fieldInstance.pattern && fieldInstance.isValid) {
|
||||
this.validatePattern(fieldInstance)
|
||||
} else {
|
||||
switch (fieldInstance.el.type) {
|
||||
case 'checkbox':
|
||||
this.validateCheckbox(fieldInstance, nameAttrVal)
|
||||
break
|
||||
case 'email':
|
||||
this.validateEmail(fieldInstance)
|
||||
break
|
||||
case 'password':
|
||||
if (fieldInstance.el.name === 'password') this.validatePassword(fieldInstance)
|
||||
if (fieldInstance.el.name === 'password-confirm') this.validateConfirmPass(fieldInstance)
|
||||
break
|
||||
case 'radio':
|
||||
this.validateRadio(fieldInstance, nameAttrVal)
|
||||
break
|
||||
case 'tel':
|
||||
this.validateTel(fieldInstance)
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -297,7 +295,9 @@ class Validation {
|
||||
fieldInstance,
|
||||
(fieldInstance.labelText ? fieldInstance.labelText : `Field`) + ` is required.`
|
||||
)
|
||||
return false
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
validatePattern(fieldInstance) {
|
||||
|
Reference in New Issue
Block a user