Bug 1417803 - Part 3: Use activeField to record the current focused input. r=lchang,ralin

MozReview-Commit-ID: 4j72RXk2Wpb

--HG--
extra : rebase_source : bb8fb6861c403105dd59b9415a897789502202cf
This commit is contained in:
Sean Lee 2017-12-11 19:28:47 +08:00
Родитель e9699c8bff
Коммит 41a96702ef
3 изменённых файлов: 100 добавлений и 70 удалений

Просмотреть файл

@ -95,18 +95,13 @@ AutofillProfileAutoCompleteSearch.prototype = {
* @param {Object} listener the listener to notify when the search is complete
*/
startSearch(searchString, searchParam, previousResult, listener) {
this.log.debug("startSearch: for", searchString, "with input", formFillController.focusedInput);
let {activeInput, activeSection, activeFieldDetail, savedFieldNames} = FormAutofillContent;
this.forceStop = false;
let savedFieldNames = FormAutofillContent.savedFieldNames;
this.log.debug("startSearch: for", searchString, "with input", activeInput);
let focusedInput = formFillController.focusedInput;
let info = FormAutofillContent.getInputDetails(focusedInput);
let isAddressField = FormAutofillUtils.isAddressField(info.fieldName);
let isInputAutofilled = info.state == FIELD_STATES.AUTO_FILLED;
let handler = FormAutofillContent.getFormHandler(focusedInput);
let activeSection = handler.activeSection;
let isAddressField = FormAutofillUtils.isAddressField(activeFieldDetail.fieldName);
let isInputAutofilled = activeFieldDetail.state == FIELD_STATES.AUTO_FILLED;
let allFieldNames = activeSection.allFieldNames;
let filledRecordGUID = activeSection.getFilledRecordGUID();
let searchPermitted = isAddressField ?
@ -114,16 +109,16 @@ AutofillProfileAutoCompleteSearch.prototype = {
FormAutofillUtils.isAutofillCreditCardsEnabled;
let AutocompleteResult = isAddressField ? AddressResult : CreditCardResult;
ProfileAutocomplete.lastProfileAutoCompleteFocusedInput = focusedInput;
ProfileAutocomplete.lastProfileAutoCompleteFocusedInput = activeInput;
// Fallback to form-history if ...
// - specified autofill feature is pref off.
// - no profile can fill the currently-focused input.
// - the current form has already been populated.
// - (address only) less than 3 inputs are covered by all saved fields in the storage.
if (!searchPermitted || !savedFieldNames.has(info.fieldName) ||
if (!searchPermitted || !savedFieldNames.has(activeFieldDetail.fieldName) ||
(!isInputAutofilled && filledRecordGUID) || (isAddressField &&
allFieldNames.filter(field => savedFieldNames.has(field)).length < FormAutofillUtils.AUTOFILL_FIELDS_THRESHOLD)) {
if (focusedInput.autocomplete == "off") {
if (activeInput.autocomplete == "off") {
// Create a dummy result as an empty search result.
let result = new AutocompleteResult("", "", [], [], {});
listener.onSearchResult(this, result);
@ -147,7 +142,7 @@ AutofillProfileAutoCompleteSearch.prototype = {
return;
}
let infoWithoutElement = Object.assign({}, info);
let infoWithoutElement = Object.assign({}, activeFieldDetail);
delete infoWithoutElement.elementWeakRef;
let data = {
@ -165,10 +160,11 @@ AutofillProfileAutoCompleteSearch.prototype = {
let adaptedRecords = activeSection.getAdaptedProfiles(records);
let result = null;
let handler = FormAutofillContent.activeHandler;
let isSecure = InsecurePasswordUtils.isFormSecure(handler.form);
result = new AutocompleteResult(searchString,
info.fieldName,
activeFieldDetail.fieldName,
allFieldNames,
adaptedRecords,
{isSecure, isInputAutofilled});
@ -254,11 +250,11 @@ let ProfileAutocomplete = {
observe(subject, topic, data) {
switch (topic) {
case "autocomplete-will-enter-text": {
if (!formFillController.focusedInput) {
if (!FormAutofillContent.activeInput) {
// The observer notification is for autocomplete in a different process.
break;
}
this._fillFromAutocompleteRow(formFillController.focusedInput);
this._fillFromAutocompleteRow(FormAutofillContent.activeInput);
break;
}
}
@ -283,7 +279,7 @@ let ProfileAutocomplete = {
_fillFromAutocompleteRow(focusedInput) {
this.log.debug("_fillFromAutocompleteRow:", focusedInput);
let formDetails = FormAutofillContent.getFormDetails(focusedInput);
let formDetails = FormAutofillContent.activeFormDetails;
if (!formDetails) {
// The observer notification is for a different frame.
return;
@ -297,28 +293,23 @@ let ProfileAutocomplete = {
}
let profile = JSON.parse(this.lastProfileAutoCompleteResult.getCommentAt(selectedIndex));
let {fieldName} = FormAutofillContent.getInputDetails(focusedInput);
let formHandler = FormAutofillContent.getFormHandler(focusedInput);
let {fieldName} = FormAutofillContent.activeFieldDetail;
formHandler.autofillFormFields(profile).then(() => {
FormAutofillContent.activeHandler.autofillFormFields(profile).then(() => {
autocompleteController.searchString = profile[fieldName];
});
},
_clearProfilePreview() {
let focusedInput = formFillController.focusedInput || this.lastProfileAutoCompleteFocusedInput;
if (!focusedInput || !FormAutofillContent.getFormDetails(focusedInput)) {
if (!this.lastProfileAutoCompleteFocusedInput || !FormAutofillContent.activeSection) {
return;
}
let formHandler = FormAutofillContent.getFormHandler(focusedInput);
formHandler.activeSection.clearPreviewedFormFields();
FormAutofillContent.activeSection.clearPreviewedFormFields();
},
_previewSelectedProfile(selectedIndex) {
let focusedInput = formFillController.focusedInput;
if (!focusedInput || !FormAutofillContent.getFormDetails(focusedInput)) {
if (!FormAutofillContent.activeInput || !FormAutofillContent.activeFormDetails) {
// The observer notification is for a different process/frame.
return;
}
@ -329,9 +320,7 @@ let ProfileAutocomplete = {
}
let profile = JSON.parse(this.lastProfileAutoCompleteResult.getCommentAt(selectedIndex));
let formHandler = FormAutofillContent.getFormHandler(focusedInput);
formHandler.activeSection.previewFormFields(profile);
FormAutofillContent.activeSection.previewFormFields(profile);
},
};
@ -352,6 +341,12 @@ var FormAutofillContent = {
*/
savedFieldNames: null,
/**
* @type {Object} The object where to store the active items, e.g. element,
* handler, section, and field detail.
*/
_activeItems: {},
init() {
FormAutofillUtils.defineLazyLogGetter(this, "FormAutofillContent");
@ -441,25 +436,6 @@ var FormAutofillContent = {
}
},
/**
* Get the input's information from cache which is created after page identified.
*
* @param {HTMLInputElement} element Focused input which triggered profile searching
* @returns {Object|null}
* Return target input's information that cloned from content cache
* (or return null if the information is not found in the cache).
*/
getInputDetails(element) {
let formDetails = this.getFormDetails(element);
for (let detail of formDetails) {
let detailElement = detail.elementWeakRef.get();
if (detailElement && element == detailElement) {
return detail;
}
}
return null;
},
/**
* Get the form's handler from cache which is created after page identified.
*
@ -469,28 +445,82 @@ var FormAutofillContent = {
* (or return null if the information is not found in the cache).
*
*/
getFormHandler(element) {
_getFormHandler(element) {
let rootElement = FormLikeFactory.findRootForField(element);
return this._formsDetails.get(rootElement);
},
/**
* Get the form's information from cache which is created after page identified.
* Get the active form's information from cache which is created after page
* identified.
*
* @param {HTMLInputElement} element Focused input which triggered profile searching
* @returns {Array<Object>|null}
* Return target form's information from content cache
* (or return null if the information is not found in the cache).
*
*/
getFormDetails(element) {
let formHandler = this.getFormHandler(element);
get activeFormDetails() {
let formHandler = this.activeHandler;
return formHandler ? formHandler.fieldDetails : null;
},
getAllFieldNames(element) {
let formHandler = this.getFormHandler(element);
return formHandler ? formHandler.activeSection.allFieldNames : null;
/**
* All active items should be updated according the active element of
* `formFillController.focusedInput`. All of them including element,
* handler, section, and field detail, can be retrieved by their own getters.
*
* @param {HTMLElement|null} element The active item should be updated based
* on this or `formFillController.focusedInput` will be taken.
*/
updateActiveInput(element) {
element = element || formFillController.focusedInput;
let handler = this._getFormHandler(element);
if (handler) {
handler.focusedInput = element;
}
this._activeItems = {
handler,
element,
section: handler ? handler.activeSection : null,
fieldDetail: null,
};
},
get activeInput() {
return this._activeItems.element;
},
get activeHandler() {
return this._activeItems.handler;
},
get activeSection() {
return this._activeItems.section;
},
/**
* Get the active input's information from cache which is created after page
* identified.
*
* @returns {Object|null}
* Return the active input's information that cloned from content cache
* (or return null if the information is not found in the cache).
*/
get activeFieldDetail() {
if (!this._activeItems.fieldDetail) {
let formDetails = this.activeFormDetails;
if (!formDetails) {
return null;
}
for (let detail of formDetails) {
let detailElement = detail.elementWeakRef.get();
if (detailElement && this.activeInput == detailElement) {
this._activeItems.fieldDetail = detail;
break;
}
}
}
return this._activeItems.fieldDetail;
},
identifyAutofillFields(element) {
@ -501,12 +531,11 @@ var FormAutofillContent = {
Services.cpmm.sendAsyncMessage("FormAutofill:InitStorage");
}
let formHandler = this.getFormHandler(element);
let formHandler = this._getFormHandler(element);
if (!formHandler) {
let formLike = FormLikeFactory.createFromField(element);
formHandler = new FormAutofillHandler(formLike);
} else if (!formHandler.updateFormIfNeeded(element)) {
formHandler.focusedInput = element;
this.log.debug("No control is removed or inserted since last collection.");
return;
}
@ -519,17 +548,15 @@ var FormAutofillContent = {
validDetails.forEach(detail =>
this._markAsAutofillField(detail.elementWeakRef.get())
);
formHandler.focusedInput = element;
},
clearForm() {
let focusedInput = formFillController.focusedInput || ProfileAutocomplete._lastAutoCompleteFocusedInput;
let focusedInput = this.activeInput || ProfileAutocomplete._lastAutoCompleteFocusedInput;
if (!focusedInput) {
return;
}
let formHandler = this.getFormHandler(focusedInput);
formHandler.activeSection.clearPopulatedForm();
this.activeSection.clearPopulatedForm();
autocompleteController.searchString = "";
},
@ -537,7 +564,7 @@ var FormAutofillContent = {
let docWin = doc.ownerGlobal;
let selectedIndex = ProfileAutocomplete._getSelectedIndex(docWin);
let lastAutoCompleteResult = ProfileAutocomplete.lastProfileAutoCompleteResult;
let focusedInput = formFillController.focusedInput;
let focusedInput = this.activeInput;
let mm = this._messageManagerFromWindow(docWin);
if (selectedIndex === -1 ||
@ -548,9 +575,9 @@ var FormAutofillContent = {
ProfileAutocomplete._clearProfilePreview();
} else {
let focusedInputDetails = this.getInputDetails(focusedInput);
let focusedInputDetails = this.activeFieldDetail;
let profile = JSON.parse(lastAutoCompleteResult.getCommentAt(selectedIndex));
let allFieldNames = FormAutofillContent.getAllFieldNames(focusedInput);
let allFieldNames = FormAutofillContent.activeSection.allFieldNames;
let profileFields = allFieldNames.filter(fieldName => !!profile[fieldName]);
let focusedCategory = FormAutofillUtils.getCategoryFromFieldName(focusedInputDetails.fieldName);
@ -588,7 +615,7 @@ var FormAutofillContent = {
_onKeyDown(e) {
let lastAutoCompleteResult = ProfileAutocomplete.lastProfileAutoCompleteResult;
let focusedInput = formFillController.focusedInput;
let focusedInput = FormAutofillContent.activeInput;
if (e.keyCode != Ci.nsIDOMKeyEvent.DOM_VK_RETURN || !lastAutoCompleteResult ||
!focusedInput || focusedInput != ProfileAutocomplete.lastProfileAutoCompleteFocusedInput) {

Просмотреть файл

@ -39,6 +39,7 @@ var FormAutofillFrameScript = {
// This is for testing purpose only which sends a message to indicate that the
// form has been identified, and ready to open popup.
sendAsyncMessage("FormAutofill:FieldsIdentified");
FormAutofillContent.updateActiveInput();
});
},
@ -54,6 +55,7 @@ var FormAutofillFrameScript = {
if (!evt.isTrusted || !FormAutofillUtils.isAutofillEnabled) {
return;
}
FormAutofillContent.updateActiveInput();
let element = evt.target;
if (!FormAutofillUtils.isFieldEligibleForAutofill(element)) {

Просмотреть файл

@ -88,12 +88,13 @@ TESTCASES.forEach(testcase => {
for (let i in testcase.targetInput) {
let input = doc.getElementById(testcase.targetInput[i]);
FormAutofillContent.identifyAutofillFields(input);
FormAutofillContent.updateActiveInput(input);
// Put the input element reference to `element` to make sure the result of
// `getInputDetails` contains the same input element.
// `activeFieldDetail` contains the same input element.
testcase.expectedResult[i].input.elementWeakRef = Cu.getWeakReference(input);
inputDetailAssertion(FormAutofillContent.getInputDetails(input),
inputDetailAssertion(FormAutofillContent.activeFieldDetail,
testcase.expectedResult[i].input);
let formDetails = testcase.expectedResult[i].form;
@ -104,7 +105,7 @@ TESTCASES.forEach(testcase => {
formDetail.elementWeakRef = Cu.getWeakReference(doc.querySelector(queryString));
}
FormAutofillContent.getFormDetails(input).forEach((detail, index) => {
FormAutofillContent.activeFormDetails.forEach((detail, index) => {
inputDetailAssertion(detail, formDetails[index]);
});
}