From 8ebc4229547a9cb0f661b1bb690f22fa2e2f8d85 Mon Sep 17 00:00:00 2001 From: Kenneth Sequeira Date: Thu, 13 Jun 2019 18:03:49 +0530 Subject: [PATCH 1/2] fix email validation for contact page --- frappe/website/js/website.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/website/js/website.js b/frappe/website/js/website.js index a6b9064a3b..586189809e 100644 --- a/frappe/website/js/website.js +++ b/frappe/website/js/website.js @@ -374,8 +374,8 @@ $.extend(frappe, { // Utility functions window.valid_email = function(id) { - // eslint-disable-next-line - return (id.toLowerCase().search("[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?")==-1) ? 0 : 1; + // eslint-disable-next-line + return (/[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?/.test(id.toLowerCase())== 'false')? 0 : 1; } window.validate_email = valid_email; From ba88347112438e6cb953ef222e44aff4c014b17b Mon Sep 17 00:00:00 2001 From: Kenneth Sequeira <33246109+kennethsequeira@users.noreply.github.com> Date: Thu, 13 Jun 2019 19:38:12 +0530 Subject: [PATCH 2/2] remove redundant expression --- frappe/website/js/website.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/website/js/website.js b/frappe/website/js/website.js index 586189809e..d90df16fb7 100644 --- a/frappe/website/js/website.js +++ b/frappe/website/js/website.js @@ -375,7 +375,7 @@ $.extend(frappe, { window.valid_email = function(id) { // eslint-disable-next-line - return (/[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?/.test(id.toLowerCase())== 'false')? 0 : 1; + return /[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?/.test(id.toLowerCase()); } window.validate_email = valid_email;