Browse Source

Issue #1509 - Invalidate previous result when datalist is changed.

Even if `<datalist>` is dynamically changed, the autocomplete controller still
uses the previous search result. If changed, we have to ignore the previous
result that may now be invalid.

Also, even if `<datalist>` is changed, we have to keep the selected index
(See Mozilla Bug 595069), so we cannot use `ResetInternalState` in this
situation because it resets the selected index.

This resolves #1509.
tracking
Moonchild 2 months ago committed by roytam1
parent
commit
046b81d062
  1. 15
      toolkit/components/autocomplete/nsAutoCompleteController.cpp
  2. 7
      toolkit/components/autocomplete/nsIAutoCompleteInput.idl
  3. 13
      toolkit/components/satchel/nsFormFillController.cpp
  4. 1
      toolkit/components/satchel/nsFormFillController.h

15
toolkit/components/autocomplete/nsAutoCompleteController.cpp

@ -1183,11 +1183,16 @@ nsAutoCompleteController::BeforeSearches()
mSearchStatus = nsIAutoCompleteController::STATUS_SEARCHING;
mDefaultIndexCompleted = false;
// The first search result will clear mResults array, though we should pass
// the previous result to each search to allow them to reuse it. So we
// temporarily cache current results till AfterSearches().
if (!mResultCache.AppendObjects(mResults)) {
return NS_ERROR_OUT_OF_MEMORY;
bool invalidatePreviousResult = false;
mInput->GetInvalidatePreviousResult(&invalidatePreviousResult);
if (!invalidatePreviousResult) {
// ClearResults will clear the mResults array, but we should pass the
// previous result to each search to allow reusing it. So we temporarily
// cache the current results until AfterSearches().
if (!mResultCache.AppendObjects(mResults)) {
return NS_ERROR_OUT_OF_MEMORY;
}
}
mSearchesOngoing = mSearches.Length();

7
toolkit/components/autocomplete/nsIAutoCompleteInput.idl

@ -178,4 +178,11 @@ interface nsIAutoCompleteInput : nsISupports
* The userContextId of the current browser.
*/
readonly attribute unsigned long userContextId;
/**
* Indicates whether the previous result should be invalidated due to dynamic
* list updates. If search content is updated, we shouldn't use the previous
* search result.
*/
readonly attribute boolean invalidatePreviousResult;
};

13
toolkit/components/satchel/nsFormFillController.cpp

@ -670,6 +670,13 @@ nsFormFillController::GetUserContextId(uint32_t* aUserContextId)
return NS_OK;
}
NS_IMETHODIMP
nsFormFillController::GetInvalidatePreviousResult(
bool* aInvalidatePreviousResult) {
*aInvalidatePreviousResult = mInvalidatePreviousResult;
return NS_OK;
}
////////////////////////////////////////////////////////////////////////
//// nsIAutoCompleteSearch
@ -807,6 +814,8 @@ void nsFormFillController::RevalidateDataList()
return;
}
// We cannot use previous result since any items in search target are updated.
mInvalidatePreviousResult = true;
controller->StartSearch(mLastSearchString);
return;
}
@ -817,6 +826,8 @@ void nsFormFillController::RevalidateDataList()
nsCOMPtr<nsIAutoCompleteResult> result;
// We cannot use previous result since any items in search target are updated.
mInvalidatePreviousResult = true;
rv = inputListAutoComplete->AutoCompleteSearch(mLastSearchString,
mFocusedInput,
getter_AddRefs(result));
@ -864,6 +875,8 @@ nsFormFillController::OnSearchCompletion(nsIAutoCompleteResult *aResult)
NS_IMETHODIMP
nsFormFillController::HandleEvent(nsIDOMEvent* aEvent)
{
mInvalidatePreviousResult = false;
nsAutoString type;
aEvent->GetType(type);

1
toolkit/components/satchel/nsFormFillController.h

@ -120,6 +120,7 @@ protected:
bool mCompleteSelectedIndex;
bool mForceComplete;
bool mSuppressOnInput;
bool mInvalidatePreviousResult = false;
};
#endif // __nsFormFillController__

Loading…
Cancel
Save