From 095ee2e40a1a7a565cfec8755412c37c05b87a1c Mon Sep 17 00:00:00 2001 From: HerrKauwer Date: Mon, 27 Jan 2014 23:56:39 +0100 Subject: [PATCH] Cleaned up pwcheck.js --- public/site_assets/mpos/js/pwcheck.js | 139 +++++++++++++------------- 1 file changed, 70 insertions(+), 69 deletions(-) diff --git a/public/site_assets/mpos/js/pwcheck.js b/public/site_assets/mpos/js/pwcheck.js index 5433d012..c582e5b5 100644 --- a/public/site_assets/mpos/js/pwcheck.js +++ b/public/site_assets/mpos/js/pwcheck.js @@ -1,78 +1,79 @@ function scorePassword(pass) { - var score = 0; - if (!pass) - return score; - var letters = new Object(); - for (var i=0; i= 80) - return "Excellent"; - if (score >= 70) - return "Strong"; - if (score >= 50) - return "Good"; - if (score >= 40) - return "Weak"; - if (score >= 10) - return "Very weak"; - if (score < 10 && score > 1) - return "Extremely weak"; - return ""; + var score = scorePassword(pass); + if (score >= 80) + return "Excellent"; + if (score >= 70) + return "Strong"; + if (score >= 50) + return "Good"; + if (score >= 40) + return "Weak"; + if (score >= 10) + return "Very weak"; + if (score < 10 && score > 1) + return "Extremely weak"; + return ""; } function getStrengthColor(pass) { - var score = scorePassword(pass) - if (score >= 80) - return "#390" - if (score >= 70) - return "#3C0" - if (score >= 50) - return "#399" - if (score >= 40) - return "#F60" - if (score >= 10) - return "#E00" - if (score < 10) - return "#C00" - return "#999" + var score = scorePassword(pass); + if (score >= 80) + return "#390"; + if (score >= 70) + return "#3C0"; + if (score >= 50) + return "#399"; + if (score >= 40) + return "#F60"; + if (score >= 10) + return "#E00"; + if (score < 10) + return "#C00"; + return "#999"; } -function checkIfPasswordsMatch() { - var pwMatch = document.getElementById('pw_match'); - var field1 = document.getElementById('pw_field').value; - var field2 = document.getElementById('pw_field2').value; - if (field1 == field2 && field1 !== "" && field2 !== "") { - pwMatch.innerHTML = "Passwords match!"; - pwMatch.style.color = "#390"; - } else if (field1 == "" || field2 == ""){ - pwMatch.innerHTML = ""; - } else { - pwMatch.innerHTML = "Passwords don't match!"; - pwMatch.style.color = "#399"; - } +function checkIfPasswordsMatch(pwField1, pwField2) { + var pwMatch = $("#pw_match"); + if ($(pwField1).val() === $(pwField2).val() && $(pwField1).val() !== "" && $(pwField2).val() !== "") { + $(pwMatch).text("Passwords match!"); + $(pwMatch).css("color", "#390"); + } else if ($(pwField1).val() === "" || $(pwField2).val() === "") { + $(pwMatch).text(""); + } else { + $(pwMatch).text("Passwords don't match!"); + $(pwMatch).css("color", "#399"); + } } $(document).ready(function() { - $("#pw_field,#pw_field2").on("keypress keyup keydown", function() { - var fieldValue = document.getElementById('pw_field').value; - var pwStrength = document.getElementById('pw_strength'); - pwStrength.innerHTML = checkPassStrength(fieldValue); - pwStrength.style.color = getStrengthColor(fieldValue); - checkIfPasswordsMatch(); - }); + var pwField1 = $("#pw_field"); + var pwField2 = $("#pw_field2"); + + $(pwField1).add(pwField2).on("keypress keyup keydown", function() { + var fieldValue = $(pwField1).val(); + var pwStrength = $("#pw_strength"); + pwStrength.text(checkPassStrength(fieldValue)); + pwStrength.css("color", getStrengthColor(fieldValue)); + checkIfPasswordsMatch(pwField1, pwField2); + }); }); \ No newline at end of file