fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUG 10250 E-mail validation do not work with dot info SOLVED

Browse Source 
- Put a Textbox on a dynaform. Set its validation as email.
- Changed regular expresion for validation dot information EMail.
This commit is contained in:
Hector Cortez
2013-07-18 12:10:54 -04:00
parent b68c76b2f1
commit 172afce21d
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gulliver/js/form/core/form.js
View File

@@ -1528,7 +1528,7 @@ function G_Text(form, element, name)
} }
if (this.validate == "Email") { 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)) if(!pat.test(this.element.value))
{ {
@@ -3122,7 +3122,8 @@ var validateForm = function(sRequiredFields) {
var email = getField(aRequiredFields[i].name); var email = getField(aRequiredFields[i].name);
//var filter = /^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/; //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\_\-\.çñ]{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 != "") { if (!filter.test(email.value.trim()) && email.value != "") {
fielEmailInvalid.push(aRequiredFields[i].label); fielEmailInvalid.push(aRequiredFields[i].label);

4
gulliver/js/maborak/core/maborak.js
View File

@@ -1062,7 +1062,7 @@ var decimalSet=numberSet[1];var decimalCade=decimalSet.split('');var countDecima
if(countDecimalNow<countDecimal){for(;countDecimalNow<countDecimal;countDecimalNow++){decimalString+='0';} if(countDecimalNow<countDecimal){for(;countDecimalNow<countDecimal;countDecimalNow++){decimalString+='0';}
me.element.value=pluginAfter+numberSet[0]+separatorField+decimalString+pluginDecimal;}} me.element.value=pluginAfter+numberSet[0]+separatorField+decimalString+pluginDecimal;}}
break;}} break;}}
if(this.validate=="Email"){var pat=/^\w+(?:[\.-]?\w+)*@\w+(?:[\.-]?\w+)*\.\w{2,6}$/;if(!pat.test(this.element.value)) if(this.validate=="Email"){var pat=/^\w+(?:[\.-]?\w+)*@\w+(?:[\.-]?\w+)*\.\w{2,9}$/;if(!pat.test(this.element.value))
{if(this.element.value==""){this.element.className="module_app_input___gray";return;} {if(this.element.value==""){this.element.className="module_app_input___gray";return;}
else{this.element.className=this.element.className.split(" ")[0]+" FormFieldInvalid";}} else{this.element.className=this.element.className.split(" ")[0]+" FormFieldInvalid";}}
else else
@@ -1221,7 +1221,7 @@ if(bOneChecked==false)
invalid_fields.push(aRequiredFields[i].label);break;case'checkgroup':var bOneChecked=false;var aAux=document.getElementsByName('form['+aRequiredFields[i].name+'][]');for(var k=0;k<aAux.length;k++){if(aAux[k].checked){bOneChecked=true;k=aAux.length;}} invalid_fields.push(aRequiredFields[i].label);break;case'checkgroup':var bOneChecked=false;var aAux=document.getElementsByName('form['+aRequiredFields[i].name+'][]');for(var k=0;k<aAux.length;k++){if(aAux[k].checked){bOneChecked=true;k=aAux.length;}}
if(!bOneChecked){invalid_fields.push(aRequiredFields[i].label);} if(!bOneChecked){invalid_fields.push(aRequiredFields[i].label);}
break;}} break;}}
if(validate!=''){switch(aRequiredFields[i].type){case'suggest':break;case'text':if(validate=="Email"){var vtext=new input(getField(aRequiredFields[i].name));if(getField(aRequiredFields[i].name).value.trim()!=""){var email=getField(aRequiredFields[i].name);var filter=/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,3})+$/;if(!filter.test(email.value.trim())&&email.value!=""){fielEmailInvalid.push(aRequiredFields[i].label);vtext.failed();email.focus();}else{vtext.passed();}}} if(validate!=''){switch(aRequiredFields[i].type){case'suggest':break;case'text':if(validate=="Email"){var vtext=new input(getField(aRequiredFields[i].name));if(getField(aRequiredFields[i].name).value.trim()!=""){var email=getField(aRequiredFields[i].name);var filter=/^\w+(?:[\.-]?\w+)*@\w+(?:[\.-]?\w+)*\.\w{2,9}$/;if(!filter.test(email.value.trim())&&email.value!=""){fielEmailInvalid.push(aRequiredFields[i].label);vtext.failed();email.focus();}else{vtext.passed();}}}
break;}}}} break;}}}}
invalid_fields=validateGridForms(invalid_fields);if(invalid_fields.length>0||fielEmailInvalid.length>0){for(j=0;j<invalid_fields.length;j++){sMessage+=(j>0)?', ':'';sMessage+=invalid_fields[j];} invalid_fields=validateGridForms(invalid_fields);if(invalid_fields.length>0||fielEmailInvalid.length>0){for(j=0;j<invalid_fields.length;j++){sMessage+=(j>0)?', ':'';sMessage+=invalid_fields[j];}
var emailInvalidMessage="";for(j=0;j<fielEmailInvalid.length;j++){emailInvalidMessage+=(j>0)?', ':'';emailInvalidMessage+=fielEmailInvalid[j];} var emailInvalidMessage="";for(j=0;j<fielEmailInvalid.length;j++){emailInvalidMessage+=(j>0)?', ':'';emailInvalidMessage+=fielEmailInvalid[j];}