Merge pull request #130 from cfpb/focus

Add focus and trim whitespace
cfpb · Jul 27, 2017 · 77a32da · 77a32da
2 parents dad574c + c38b774
commit 77a32da
Showing 1 changed file with 14 additions and 7 deletions.
diff --git a/keycloak/themes/hmda/login/register.ftl b/keycloak/themes/hmda/login/register.ftl
@@ -18,7 +18,7 @@
         </#if>
 
         <label for="firstName">${msg("firstName")}</label>
-        <input type="text" id="firstName" class="${properties.kcInputClass!}" name="firstName" value="${(register.formData.firstName!'')?html}" />
+        <input type="text" id="firstName" class="${properties.kcInputClass!}" name="firstName" value="${(register.formData.firstName!'')?html}" autofocus />
 
         <label for="lastName">${msg("lastName")}</label>
         <input type="text" id="lastName" name="lastName" value="${(register.formData.lastName!'')?html}" />
@@ -154,23 +154,30 @@ function addInstitutionsToInput() {
 }
 
 $(document).ready(function() {
-  $('#email').on('blur keyup', function(e) {
+  var email = $('#email');
+
+  email.on('blur keyup', function(e) {
     // keycode (tab key) used to not warn when first tabbing into the email field
-    if(($('#email').val() === '' || $('#email').val() === null) && e.keyCode !== 9) {
+    if((email.val() === '' || email.val() === null) && e.keyCode !== 9) {
       $('#institutions').html('<span class="hmda-error-message">${msg("hmdaEnterEmailAddress", (properties.supportEmailTo!''))}</span>');
     } else {
       // e.keyCode will be 'undefined' on tab key
       // don't make the API call on tab keyup
-      if(emailExp.test($('#email').val()) && e.keyCode) {
-        getInstitutions(emailToDomain($('#email').val().trim()));
+      if(emailExp.test(email.val()) && e.keyCode) {
+        getInstitutions(emailToDomain(email.val().trim()));
       }
     }
   });
 
-  if($('#email').val() !== '' && $('#email').val() !== null) {
-    getInstitutions(emailToDomain($('#email').val()));
+  if(email.val() !== '' && email.val() !== null) {
+    getInstitutions(emailToDomain(email.val()));
   }
 
+  // remove whitespace from email to prevent 'invalid email'
+  email.on('blur', function(e) {
+    email.val($.trim(email.val()))
+  })
+
   $('#institutions').on('click', '.institutionsCheck', addInstitutionsToInput);
 
   // compare passwords