From 57e4f72b9e115b9f2447bb6fa24a8a7c7b25f38f Mon Sep 17 00:00:00 2001
From: Guy Marriott <guy@scopey.co.nz>
Date: Sat, 23 Apr 2016 00:31:39 +1200
Subject: [PATCH 1/2] Updating regex for email validation

---
 src/definitions/behaviors/form.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/definitions/behaviors/form.js b/src/definitions/behaviors/form.js
index 14ef0bd59..b6e76b940 100644
--- a/src/definitions/behaviors/form.js
+++ b/src/definitions/behaviors/form.js
@@ -1066,7 +1066,7 @@ $.fn.form.settings = {
   regExp: {
     bracket : /\[(.*)\]/i,
     decimal : /^\d*(\.)\d+/,
-    email   : /.+@.+\..+/i,
+    email   : /^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+@[a-z0-9]([a-z0-9-]*[a-z0-9])?(\.[a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i,
     escape  : /[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g,
     flags   : /^\/(.*)\/(.*)?/,
     integer : /^\-?\d+$/,
@@ -1174,9 +1174,6 @@ $.fn.form.settings = {
 
     // is most likely an email
     email: function(value){
-      var
-        emailRegExp = new RegExp($.fn.form.settings.regExp.email, 'i')
-      ;
       return emailRegExp.test(value);
     },
 

From 7762e4e53e915428bb4133696f34a0193ec2721e Mon Sep 17 00:00:00 2001
From: Guy Marriott <guy@scopey.co.nz>
Date: Sat, 23 Apr 2016 00:37:12 +1200
Subject: [PATCH 2/2] Updating regex for email validation

---
 src/definitions/behaviors/form.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/definitions/behaviors/form.js b/src/definitions/behaviors/form.js
index b6e76b940..7cc653ef1 100644
--- a/src/definitions/behaviors/form.js
+++ b/src/definitions/behaviors/form.js
@@ -1174,7 +1174,7 @@ $.fn.form.settings = {
 
     // is most likely an email
     email: function(value){
-      return emailRegExp.test(value);
+      return $.fn.form.settings.regExp.email.test(value);
     },
 
     // value is most likely url