Merge pull request #92 from woprandi/master

[BUG #8555] qx.util.Validate.email accepts any extension with more than 2 characters
qooxdoo · Sep 17, 2014 · f4911a2 · f4911a2
2 parents cb67a4d + a2454e5
commit f4911a2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/framework/source/class/qx/test/util/Validate.js b/framework/source/class/qx/test/util/Validate.js
@@ -54,6 +54,9 @@ qx.Class.define("qx.test.util.Validate",
       this.assertException(function() {
         qx.util.Validate.email("Custom Error Message")("not an email");
       }, qx.core.ValidationError, "Custom Error Message");
+
+      //Valid since new domain extensions
+      qx.util.Validate.email()("foo@bar.qooxdoo");
     },
 
     testString : function()

diff --git a/framework/source/class/qx/util/Validate.js b/framework/source/class/qx/util/Validate.js
@@ -129,7 +129,7 @@ qx.Class.define("qx.util.Validate",
       errorMessage = errorMessage ||
         qx.locale.Manager.tr("'%1' is not an email address.", (value || ""));
 
-      var reg = /^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/;
+      var reg = /^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,})$/;
       if (reg.test(value) === false) {
         throw new qx.core.ValidationError("Validation Error",errorMessage);
       }