From 5d269884d4151026be518dd7d979a57fc5a2a599 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Mon, 3 Oct 2016 23:54:03 -0400
Subject: [PATCH] autofill updates to support multiple forms on same page

---
 src/services/autofillService.js | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/services/autofillService.js b/src/services/autofillService.js
index c30ab486ee..fd29c25012 100644
--- a/src/services/autofillService.js
+++ b/src/services/autofillService.js
@@ -38,14 +38,13 @@ function initAutofill() {
                 }
             }
 
-            // Registration forms often have 2 password fields
-            if (passwordFieldsForForm.length === 1) {
-                pf = passwordFieldsForForm[0];
+            for (i = 0; i < passwordFieldsForForm.length; i++) {
+                pf = passwordFieldsForForm[i];
                 passwords.push(pf);
 
                 if (fillUsername) {
-                    for (i = 0; i < pageDetails.fields.length; i++) {
-                        f = pageDetails.fields[i];
+                    for (var j = 0; j < pageDetails.fields.length; j++) {
+                        f = pageDetails.fields[j];
                         if (f.form === pf.form && (f.type === 'text' || f.type === 'email' || f.type === 'tel')
                             && f.elementNumber < pf.elementNumber) {
                             username = f;
@@ -59,8 +58,8 @@ function initAutofill() {
             }
         }
 
-        if (passwordFields.length === 1 && !passwords.length) {
-            // The page does not have any forms with password fields. Use the one password field on the page and the
+        if (passwordFields.length && !passwords.length) {
+            // The page does not have any forms with password fields. Use the first password field on the page and the
             // input field just before it as the username.
 
             pf = passwordFields[0];
@@ -82,10 +81,6 @@ function initAutofill() {
                 if (username) {
                     usernames.push(username);
                 }
-                else {
-                    // As a last resort use the field just before the password
-                    usernames.push(pageDetails.fields[pf.elementNumber - 1]);
-                }
             }
         }