From ab7420535e8d7ea348f28e0e9ae2ec9c93484b06 Mon Sep 17 00:00:00 2001 From: Priya Date: Thu, 14 Jan 2016 10:14:40 -0500 Subject: [PATCH 1/2] Completed --- validator.js | 38 +++++++++++++++++++++++++++++++++++--- 1 file changed, 35 insertions(+), 3 deletions(-) diff --git a/validator.js b/validator.js index 860dab4..a614454 100644 --- a/validator.js +++ b/validator.js @@ -1,7 +1,39 @@ - //insert your code here - +//insert your code here $(function(){ - //insert your code here + $("input:submit").click(function () { + + var entered_email = $("input:text").val(); + alert(entered_email); + + var entered_password = $("input:password").val(); + alert(entered_password); + + var email = new RegExp(/^([\w-\.]+@([\w-]+\.)+[\w-]{2,4})?$/); + var pswd = new RegExp(/^(?=.*[0-9])(?=.*[a-z])(?=.*[A-Z]).{8,}$/); + + var res = email.test(entered_email); + var res_pswd = pswd.test(entered_password); + + if (res == true && res_pswd == true) { + alert('Congrats! thats a valid email address and password'); + $(".errors").hide(); + } + if (res == true && res_pswd != true){ + alert('Invalid password'); + $("li").first().hide(); + } + if (res != true && res_pswd == true){ + alert('Invalid email'); + $('li').hide(); + $('li:first-child').show(); + } + if (res != true && res_pswd != true){ + alert("Invalid email and password") + $(".errors").show(); + } + + }); + }); From de71e5641be4adbbf36f83092b4f7a90dfbce1c0 Mon Sep 17 00:00:00 2001 From: Priya Date: Thu, 14 Jan 2016 13:28:47 -0500 Subject: [PATCH 2/2] indentation wasn't uniform --- validator.js | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/validator.js b/validator.js index a614454..a191528 100644 --- a/validator.js +++ b/validator.js @@ -4,34 +4,34 @@ $(function(){ $("input:submit").click(function () { - var entered_email = $("input:text").val(); - alert(entered_email); + var entered_email = $("input:text").val(); + alert(entered_email); - var entered_password = $("input:password").val(); - alert(entered_password); + var entered_password = $("input:password").val(); + alert(entered_password); - var email = new RegExp(/^([\w-\.]+@([\w-]+\.)+[\w-]{2,4})?$/); - var pswd = new RegExp(/^(?=.*[0-9])(?=.*[a-z])(?=.*[A-Z]).{8,}$/); + var email = new RegExp(/^([\w-\.]+@([\w-]+\.)+[\w-]{2,4})?$/); + var pswd = new RegExp(/^(?=.*[0-9])(?=.*[a-z])(?=.*[A-Z]).{8,}$/); - var res = email.test(entered_email); - var res_pswd = pswd.test(entered_password); + var res = email.test(entered_email); + var res_pswd = pswd.test(entered_password); - if (res == true && res_pswd == true) { + if (res == true && res_pswd == true) { alert('Congrats! thats a valid email address and password'); - $(".errors").hide(); - } - if (res == true && res_pswd != true){ - alert('Invalid password'); - $("li").first().hide(); - } + $(".errors").hide(); + } + if (res == true && res_pswd != true){ + alert('Invalid password'); + $("li").first().hide(); + } if (res != true && res_pswd == true){ - alert('Invalid email'); - $('li').hide(); - $('li:first-child').show(); + alert('Invalid email'); + $('li').hide(); + ('li:first-child').show(); } if (res != true && res_pswd != true){ - alert("Invalid email and password") - $(".errors").show(); + alert("Invalid email and password") + $(".errors").show(); } });