corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1302472 - keyboard selected value in autocomplete popup cannot be confirmed with <enter> if completedefaultindex is true but completeselectedindex is false. r=adw

Browse Source 
MozReview-Commit-ID: FR4pKGZLAl2
This commit is contained in:
Marco Bonardo
2016-09-17 14:03:37 +02:00
parent 27c16086f2
commit f838352255
2 changed files with 43 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
toolkit/components/autocomplete/nsAutoCompleteController.cpp
View File

@@ -1396,15 +1396,23 @@ nsAutoCompleteController::EnterMatch(bool aIsPopupSelection,
if (selectedIndex >= 0) {
nsAutoString inputValue;
input->GetTextValue(inputValue);
bool defaultCompleted = mDefaultIndexCompleted &&
inputValue.Equals(mPlaceholderCompletionString,
nsCaseInsensitiveStringComparator());
if (aIsPopupSelection || (!completeSelection && !defaultCompleted)) {
if (aIsPopupSelection || !completeSelection) {
// We need to fill-in the value if:
// * completeselectedindex is false and we didn't defaultComplete
// * completeselectedindex is false
// * A row in the popup was confirmed
//
// TODO: This is not totally correct, cause it will also confirm
// a result selected with a simple mouseover, that could also have
// happened accidentally, maybe touching a touchpad.
// The reason is that autocomplete.xml sets selectedIndex on mousemove
// making impossible, in the !completeSelection case, to distinguish if
// the user wanted to confirm autoFill or the popup entry.
// The solution may be to change autocomplete.xml to set selectedIndex
// only on popupClick, but that requires changing the selection behavior.
GetResultValueAt(selectedIndex, true, value);
} else if (defaultCompleted) {
} else if (mDefaultIndexCompleted &&
inputValue.Equals(mPlaceholderCompletionString,
nsCaseInsensitiveStringComparator())) {
// We also need to fill-in the value if the default index completion was
// confirmed, though we cannot use the selectedIndex cause the selection
// may have been changed by the mouse in the meanwhile.