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

Bug 497541 - Autocomplete dropdown should update when text inserted before end. r=gavin

Browse Source
This commit is contained in:
MattN
2009-07-11 09:25:57 +02:00
parent 8c448ac8dc
commit 93efc549d4
7 changed files with 161 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
toolkit/components/autocomplete/public/nsIAutoCompleteController.idl
View File

@@ -41,7 +41,7 @@
interface nsIAutoCompleteInput;
[scriptable, uuid(6F08D134-8536-4B28-B456-D150FBAA66A9)]
[scriptable, uuid(46a86173-0ab5-44b2-ab51-722cb3db1b60)]
interface nsIAutoCompleteController : nsISupports
{
/*
@@ -82,7 +82,7 @@ interface nsIAutoCompleteController : nsISupports
* means of changing the text value, including typing a character, backspacing, deleting, or
* pasting in an entirely new value.
*/
void handleText(in boolean aIgnoreSelection);
void handleText();
/*
* Notify the controller that the user wishes to enter the current text. If

28
toolkit/components/autocomplete/src/nsAutoCompleteController.cpp
View File

@@ -194,7 +194,7 @@ nsAutoCompleteController::StartSearch(const nsAString &aSearchString)
}
NS_IMETHODIMP
nsAutoCompleteController::HandleText(PRBool aIgnoreSelection)
nsAutoCompleteController::HandleText()
{
if (!mInput) {
// Stop all searches in case they are async.
@@ -254,12 +254,6 @@ nsAutoCompleteController::HandleText(PRBool aIgnoreSelection)
} else
mBackspaced = PR_FALSE;
if (mRowCount == 0)
// XXX Handle the case where we have no results because of an ignored prefix.
// This is just a hack. I have no idea what I'm doing. Hewitt, fix this the right
// way when you get a chance. -dwh
ClearResults();
mSearchString = newValue;
// Don't search if the value is empty
@@ -268,18 +262,7 @@ nsAutoCompleteController::HandleText(PRBool aIgnoreSelection)
return NS_OK;
}
if (aIgnoreSelection) {
StartSearchTimer();
} else {
// Kick off the search only if the cursor is at the end of the textbox
PRInt32 selectionStart;
input->GetSelectionStart(&selectionStart);
PRInt32 selectionEnd;
input->GetSelectionEnd(&selectionEnd);
if (selectionStart == selectionEnd && selectionStart == (PRInt32) mSearchString.Length())
StartSearchTimer();
}
StartSearchTimer();
return NS_OK;
}
@@ -379,7 +362,7 @@ nsAutoCompleteController::HandleEndComposition()
SetSearchString(EmptyString());
if (!value.IsEmpty()) {
// Show the popup with a filtered result set
HandleText(PR_TRUE);
HandleText();
} else if (forceOpenPopup) {
PRBool cancel;
HandleKeyNavigation(nsIDOMKeyEvent::DOM_VK_DOWN, &cancel);
@@ -561,7 +544,7 @@ nsAutoCompleteController::HandleDelete(PRBool *_retval)
input->GetPopupOpen(&isOpen);
if (!isOpen || mRowCount <= 0) {
// Nothing left to delete, proceed as normal
HandleText(PR_FALSE);
HandleText();
return NS_OK;
}
@@ -1019,7 +1002,8 @@ nsAutoCompleteController::StartSearch()
PRUint16 searchResult;
result->GetSearchResult(&searchResult);
if (searchResult != nsIAutoCompleteResult::RESULT_SUCCESS &&
searchResult != nsIAutoCompleteResult::RESULT_SUCCESS_ONGOING)
searchResult != nsIAutoCompleteResult::RESULT_SUCCESS_ONGOING &&
searchResult != nsIAutoCompleteResult::RESULT_NOMATCH)
result = nsnull;
}