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

Merge branch '2.0-dev' of git.colosa.net:processmaker into 2.0-dev

Browse Source
This commit is contained in:
Carlos Pacha
2011-11-17 17:01:14 -04:00
parent 3c5572cf34 d82af1037c
commit 9851724e6b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -785,7 +785,7 @@ function G_Text( form, element, name, type )
if(this.validate=="Email") if(this.validate=="Email")
{ {
//var pat=/^[\w\_\-\.çñ]{2,255}@[\w\_\-]{2,255}\.[a-z]{1,3}\.?[a-z]{0,3}$/; //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)) if(!pat.test(this.element.value))
{ {
//old|if(this.required=="0"&&this.element.value=="") { //old|if(this.required=="0"&&this.element.value=="") {

2
workflow/engine/xmlform/users/users_New.xml
View File

@@ -234,7 +234,7 @@ var existsElements = function () {
*/ */
var validateLocalEmail = function(sEmail){ 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)) { if (!sFilter.test(sEmail.value)) {
return false; return false;
} else { } else {