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

Bug 695014 - nsFormFillController shouldn't watch input elements withouth a list nor autocomplete. f=ehsan, r=bz,zpao,dolske

Browse Source
This commit is contained in:
Mounir Lamouri
2011-11-20 19:02:47 +01:00
parent 16f899f637
commit f8c9786bee
4 changed files with 46 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
toolkit/components/satchel/nsFormFillController.cpp
View File

@@ -71,6 +71,7 @@
#include "nsIDOMNSEditableElement.h"
#include "nsIDOMNSEvent.h"
#include "mozilla/dom/Element.h"
#include "nsContentUtils.h"
NS_IMPL_ISUPPORTS5(nsFormFillController,
nsIFormFillController,
@@ -573,7 +574,8 @@ nsFormFillController::StartSearch(const nsAString &aSearchString, const nsAStrin
getter_AddRefs(result));
} else {
nsCOMPtr<nsIAutoCompleteResult> formHistoryResult;
if (!IsInputAutoCompleteOff()) {
if (mFocusedInput && nsContentUtils::IsAutocompleteEnabled(mFocusedInput)) {
nsCOMPtr <nsIFormAutoComplete> formAutoComplete =
do_GetService("@mozilla.org/satchel/form-autocomplete;1", &rv);
NS_ENSURE_SUCCESS(rv, rv);
@@ -759,8 +761,11 @@ nsFormFillController::Focus(nsIDOMEvent* aEvent)
bool isReadOnly = false;
input->GetReadOnly(&isReadOnly);
nsAutoString autocomplete;
input->GetAttribute(NS_LITERAL_STRING("autocomplete"), autocomplete);
bool autocomplete = nsContentUtils::IsAutocompleteEnabled(input);
nsCOMPtr<nsIDOMHTMLElement> datalist;
input->GetList(getter_AddRefs(datalist));
bool hasList = datalist != nsnull;
PRInt32 dummy;
bool isPwmgrInput = false;
@@ -768,39 +773,15 @@ nsFormFillController::Focus(nsIDOMEvent* aEvent)
isPwmgrInput = true;
nsCOMPtr<nsIFormControl> formControl = do_QueryInterface(input);
if (formControl && formControl->IsSingleLineTextControl(true) &&
!isReadOnly || isPwmgrInput) {
if (isPwmgrInput || (formControl &&
formControl->IsSingleLineTextControl(PR_TRUE) &&
(hasList || autocomplete) && !isReadOnly)) {
StartControllingInput(input);
}
return NS_OK;
}
bool
nsFormFillController::IsInputAutoCompleteOff()
{
bool autoCompleteOff = false;
if (mFocusedInput) {
nsAutoString autocomplete;
mFocusedInput->GetAttribute(NS_LITERAL_STRING("autocomplete"), autocomplete);
// Check the input for autocomplete="off", then the form
if (autocomplete.LowerCaseEqualsLiteral("off")) {
autoCompleteOff = true;
} else {
nsCOMPtr<nsIDOMHTMLFormElement> form;
mFocusedInput->GetForm(getter_AddRefs(form));
if (form)
form->GetAttribute(NS_LITERAL_STRING("autocomplete"), autocomplete);
autoCompleteOff = autocomplete.LowerCaseEqualsLiteral("off");
}
}
return autoCompleteOff;
}
nsresult
nsFormFillController::KeyPress(nsIDOMEvent* aEvent)
{