diff --git a/gulliver/js/form/core/form.js b/gulliver/js/form/core/form.js index cd408f5fe..75d6b58b3 100755 --- a/gulliver/js/form/core/form.js +++ b/gulliver/js/form/core/form.js @@ -1528,7 +1528,7 @@ function G_Text(form, element, name) } if (this.validate == "Email") { - var pat = /^\w+(?:[\.-]?\w+)*@\w+(?:[\.-]?\w+)*\.\w{2,6}$/; + var pat = /^\w+(?:[\.-]?\w+)*@\w+(?:[\.-]?\w+)*\.\w{2,9}$/; if(!pat.test(this.element.value)) { @@ -3122,7 +3122,8 @@ var validateForm = function(sRequiredFields) { var email = getField(aRequiredFields[i].name); //var filter = /^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/; //var filter = /^[\w\_\-\.çñ]{2,255}@[\w\_\-]{2,255}\.[a-z]{1,3}\.?[a-z]{0,3}$/; - var filter =/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,3})+$/; + // var filter = /^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,3})+$/; + var filter = /^\w+(?:[\.-]?\w+)*@\w+(?:[\.-]?\w+)*\.\w{2,9}$/; if (!filter.test(email.value.trim()) && email.value != "") { fielEmailInvalid.push(aRequiredFields[i].label); diff --git a/gulliver/js/maborak/core/maborak.js b/gulliver/js/maborak/core/maborak.js index 54ca9e1a9..0ae290d4c 100644 --- a/gulliver/js/maborak/core/maborak.js +++ b/gulliver/js/maborak/core/maborak.js @@ -1062,7 +1062,7 @@ var decimalSet=numberSet[1];var decimalCade=decimalSet.split('');var countDecima if(countDecimalNow0||fielEmailInvalid.length>0){for(j=0;j0)?', ':'';sMessage+=invalid_fields[j];} var emailInvalidMessage="";for(j=0;j0)?', ':'';emailInvalidMessage+=fielEmailInvalid[j];}