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

Bug 1647596 - Make setting action hint simple. r=masayuki

Browse Source 
This is follow up issue of implementing enterkeyhint attribute.

Differential Revision: https://phabricator.services.mozilla.com/D122407
This commit is contained in:
Makoto Kato
2021-08-12 04:38:38 +00:00
parent 6d46d1336a
commit df879c0ea1
2 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
dom/events/IMEStateManager.cpp
View File

@@ -1266,9 +1266,20 @@ static bool IsNextFocusableElementTextControl(Element* aInputContent) {
return !inputElement->ReadOnly();
}
static void GetActionHint(nsIContent& aContent, nsAString& aActionHint) {
// If enterkeyhint is set, we don't infer action hint.
if (!aActionHint.IsEmpty()) {
static void GetActionHint(const IMEState& aState, const nsIContent& aContent,
nsAString& aActionHint) {
MOZ_ASSERT(aContent.IsHTMLElement());
if (aState.IsEditable() && StaticPrefs::dom_forms_enterkeyhint()) {
nsGenericHTMLElement::FromNode(aContent)->GetEnterKeyHint(aActionHint);
// If enterkeyhint is set, we don't infer action hint.
if (!aActionHint.IsEmpty()) {
return;
}
}
if (!aContent.IsAnyOfHTMLElements(nsGkAtoms::input, nsGkAtoms::textarea)) {
return;
}
@@ -1370,11 +1381,6 @@ void IMEStateManager::SetIMEState(const IMEState& aState,
nsContentUtils::IsInPrivateBrowsing(aPresContext->Document());
if (aContent && aContent->IsHTMLElement()) {
if (aState.IsEditable() && StaticPrefs::dom_forms_enterkeyhint()) {
nsGenericHTMLElement::FromNode(aContent)->GetEnterKeyHint(
context.mActionHint);
}
if (aContent->IsHTMLElement(nsGkAtoms::input)) {
HTMLInputElement* inputElement = HTMLInputElement::FromNode(aContent);
if (inputElement->HasBeenTypePassword() && aState.IsEditable()) {
@@ -1383,12 +1389,12 @@ void IMEStateManager::SetIMEState(const IMEState& aState,
inputElement->GetType(context.mHTMLInputType);
}
GetActionHint(*aContent, context.mActionHint);
} else if (aContent->IsHTMLElement(nsGkAtoms::textarea)) {
context.mHTMLInputType.Assign(nsGkAtoms::textarea->GetUTF16String());
GetActionHint(*aContent, context.mActionHint);
}
GetActionHint(aState, *aContent, context.mActionHint);
if (aState.IsEditable() &&
(StaticPrefs::dom_forms_inputmode() ||
nsContentUtils::IsChromeDoc(aContent->OwnerDoc()))) {

2
dom/html/nsGenericHTMLElement.h
View File

@@ -184,7 +184,7 @@ class nsGenericHTMLElement : public nsGenericHTMLElementBase {
SetHTMLAttr(nsGkAtoms::autocapitalize, aValue, aRv);
}
void GetEnterKeyHint(nsAString& aValue) {
void GetEnterKeyHint(nsAString& aValue) const {
GetEnumAttr(nsGkAtoms::enterkeyhint, nullptr, aValue);
}
void SetEnterKeyHint(const nsAString& aValue, ErrorResult& aRv) {