Merge branch '2.0-dev' of git.colosa.net:processmaker into 2.0-dev
This commit is contained in:
@@ -785,7 +785,7 @@ function G_Text( form, element, name, type )
|
||||
if(this.validate=="Email")
|
||||
{
|
||||
//var pat=/^[\w\_\-\.çñ]{2,255}@[\w\_\-]{2,255}\.[a-z]{1,3}\.?[a-z]{0,3}$/;
|
||||
var pat=/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,3})+$/;
|
||||
var pat=/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,6})+$/;
|
||||
if(!pat.test(this.element.value))
|
||||
{
|
||||
//old|if(this.required=="0"&&this.element.value=="") {
|
||||
|
||||
@@ -234,7 +234,7 @@ var existsElements = function () {
|
||||
*/
|
||||
|
||||
var validateLocalEmail = function(sEmail){
|
||||
var sFilter = /^[a-zA-Z]+([_\.-]?[a-zA-Z0-9]+)*@[a-zA-Z0-9]+([\.-]?[a-zA-Z0-9]+)*(\.[a-zA-Z]{2,4})+$/;
|
||||
var sFilter = /^[a-zA-Z]+([_\.-]?[a-zA-Z0-9]+)*@[a-zA-Z0-9]+([\.-]?[a-zA-Z0-9]+)*(\.[a-zA-Z]{2,6})+$/;
|
||||
if (!sFilter.test(sEmail.value)) {
|
||||
return false;
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user