RT# 75817 - updated UI to be more intuitive

[freeside.git] / httemplate / elements / validate_password.html

diff --git a/httemplate/elements/validate_password.html b/httemplate/elements/validate_password.html
index d7e9f6d..73c0db2 100644 (file)
--- a/httemplate/elements/validate_password.html
+++ b/httemplate/elements/validate_password.html
@@ -25,9 +25,11 @@ function add_password_validation (fieldid, submitid) {
   inputfield.onkeydown = function(e) {
     var key;
     if (window.event) { key = window.event.keyCode; }
-    else { key = e.which; }
+    else { key = e.which; } // for ff browsers
+    // some browsers allow the enter key to submit a form even if the submit button is disabled
+    // below prevents enter key from submiting form if password has not been validated.
     if (key == '13') {
-      var check = checkPasswordValidation();
+      var check = checkPasswordValidation(fieldid);
       return check;
     }
   }
@@ -59,6 +61,7 @@ function add_password_validation (fieldid, submitid) {
       );
     } else {
       resultfield.innerHTML = '';
+      if (submitid){ document.getElementById(submitid).disabled = false; }
     }
   };
 }