RA-2093: Form Navigator: Properly default to first field on a form

Author: mogoodrich

omod/src/main/webapp/resources/scripts/navigator/navigator.js

@@ -78,6 +78,7 @@ formElement.hasClass('allow-empty-form') || formElement.find('htmlform').hasClas
     var questionsHandler = QuestionsHandler(questions, prevButton);
     var fieldsHandler = FieldsKeyboardHandler(fields, questionsHandler);
 
+    // go to the first field by triggering a tab
     fieldsHandler.handleTabKey();
 
     $('body').keydown(function(key) {

omod/src/main/webapp/resources/scripts/navigator/navigatorHandlers.js

@@ -69,10 +69,11 @@ function FieldsKeyboardHandler(fieldModels, questionsHandler) {
                 }
             } else {
                 if(showFirstFieldIfNoneIsActive) {
-                    questionsHandler.selectedQuestion() || questionsHandler.nextQuestion();
-                    if (questionsHandler.selectedQuestion() && questionsHandler.selectedQuestion().fields && questionsHandler.selectedQuestion().fields.length > 0) {
-                      questionsHandler.selectedQuestion().fields[0].toggleSelection();
+                    // the assumption here is that there is *at least* one field on the form, which should always be the case if there is a confirmation page
+                    while(!questionsHandler.selectedQuestion() || !questionsHandler.selectedQuestion().fields || questionsHandler.selectedQuestion().fields.length === 0) {
+                        questionsHandler.nextQuestion();
                     }
+                    questionsHandler.selectedQuestion().fields[0].toggleSelection();
                     return true;
                 }
             }