Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-20 16:55:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 4ff3acec9515 (bug 1349489). a=backout

Browse Source
This commit is contained in:
Iris Hsiao 2017-04-27 10:30:10 +08:00
parent cff14d343b
commit ba7c2486c7
2 changed files with 30 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
browser/extensions/formautofill/FormAutofillHandler.jsm
View File

@ -61,8 +61,36 @@ FormAutofillHandler.prototype = {
* Set fieldDetails from the form about fields that can be autofilled.
*/
collectFormFields() {
let fieldDetails = FormAutofillHeuristics.getFormInfo(this.form);
this.fieldDetails = fieldDetails ? fieldDetails : [];
this.fieldDetails = [];
for (let element of this.form.elements) {
// Exclude elements to which no autocomplete field has been assigned.
let info = FormAutofillHeuristics.getInfo(element);
if (!info) {
continue;
}
// Store the association between the field metadata and the element.
if (this.fieldDetails.some(f => f.section == info.section &&
f.addressType == info.addressType &&
f.contactType == info.contactType &&
f.fieldName == info.fieldName)) {
// A field with the same identifier already exists.
log.debug("Not collecting a field matching another with the same info:", info);
continue;
}
let formatWithElement = {
section: info.section,
addressType: info.addressType,
contactType: info.contactType,
fieldName: info.fieldName,
elementWeakRef: Cu.getWeakReference(element),
};
this.fieldDetails.push(formatWithElement);
}
log.debug("Collected details on", this.fieldDetails.length, "fields");
},

33
browser/extensions/formautofill/FormAutofillHeuristics.jsm
View File

@ -30,39 +30,6 @@ this.FormAutofillHeuristics = {
"email",
],
getFormInfo(form) {
let fieldDetails = [];
for (let element of form.elements) {
// Exclude elements to which no autocomplete field has been assigned.
let info = this.getInfo(element);
if (!info) {
continue;
}
// Store the association between the field metadata and the element.
if (fieldDetails.some(f => f.section == info.section &&
f.addressType == info.addressType &&
f.contactType == info.contactType &&
f.fieldName == info.fieldName)) {
// A field with the same identifier already exists.
log.debug("Not collecting a field matching another with the same info:", info);
continue;
}
let formatWithElement = {
section: info.section,
addressType: info.addressType,
contactType: info.contactType,
fieldName: info.fieldName,
elementWeakRef: Cu.getWeakReference(element),
};
fieldDetails.push(formatWithElement);
}
return fieldDetails;
},
getInfo(element) {
if (!(element instanceof Ci.nsIDOMHTMLInputElement)) {
return null;