diff options
author | Moonchild <moonchild@palemoon.org> | 2020-05-21 15:00:59 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-21 15:00:59 +0200 |
commit | 5d6691e9d08dce30b461fced32ece77fd3ff1933 (patch) | |
tree | f91d5ae02b0c2bcc41a08bb1a594c8a2ebe02eef /dom/html/nsGenericHTMLElement.cpp | |
parent | 14f6f230d7545d3906a7fd72f3d4677f3b6503d8 (diff) | |
parent | 0a19762d3bb5f6bcaa00a8f168e469d9fdda76b9 (diff) | |
download | UXP-5d6691e9d08dce30b461fced32ece77fd3ff1933.tar UXP-5d6691e9d08dce30b461fced32ece77fd3ff1933.tar.gz UXP-5d6691e9d08dce30b461fced32ece77fd3ff1933.tar.lz UXP-5d6691e9d08dce30b461fced32ece77fd3ff1933.tar.xz UXP-5d6691e9d08dce30b461fced32ece77fd3ff1933.zip |
Merge pull request #1559 from athenian200/form-disabled-issue
Restore -moz-input-disabled and allow events to target disabled form controls.
Diffstat (limited to 'dom/html/nsGenericHTMLElement.cpp')
-rw-r--r-- | dom/html/nsGenericHTMLElement.cpp | 35 |
1 files changed, 26 insertions, 9 deletions
diff --git a/dom/html/nsGenericHTMLElement.cpp b/dom/html/nsGenericHTMLElement.cpp index 3cf19ea8f..17dba6da9 100644 --- a/dom/html/nsGenericHTMLElement.cpp +++ b/dom/html/nsGenericHTMLElement.cpp @@ -2108,6 +2108,14 @@ nsGenericHTMLFormElement::PreHandleEvent(EventChainVisitor& aVisitor) return nsGenericHTMLElement::PreHandleEvent(aVisitor); } +/* virtual */ +bool +nsGenericHTMLFormElement::IsDisabled() const +{ + return HasAttr(kNameSpaceID_None, nsGkAtoms::disabled) || + (mFieldSet && mFieldSet->IsDisabled()); +} + void nsGenericHTMLFormElement::ForgetFieldSet(nsIContent* aFieldset) { @@ -2277,10 +2285,17 @@ nsGenericHTMLFormElement::FormIdUpdated(Element* aOldElement, } bool -nsGenericHTMLFormElement::IsElementDisabledForEvents(EventMessage aMessage, +nsGenericHTMLFormElement::IsElementDisabledForEvents(WidgetEvent* aEvent, nsIFrame* aFrame) { - switch (aMessage) { + MOZ_ASSERT(aEvent); + + // Allow dispatch of CustomEvent and untrusted Events. + if (!aEvent->IsTrusted()) { + return false; + } + + switch (aEvent->mMessage) { case eMouseMove: case eMouseOver: case eMouseOut: @@ -2299,13 +2314,14 @@ nsGenericHTMLFormElement::IsElementDisabledForEvents(EventMessage aMessage, break; } - // FIXME(emilio): This poking at the style of the frame is slightly bogus - // unless we flush before every event, which we don't really want to do. - if (aFrame && - aFrame->StyleUserInterface()->mUserInput == StyleUserInput::None) { - return true; + bool disabled = IsDisabled(); + if (!disabled && aFrame) { + const nsStyleUserInterface* uiStyle = aFrame->StyleUserInterface(); + disabled = uiStyle->mUserInput == StyleUserInput::None || + uiStyle->mUserInput == StyleUserInput::Disabled; + } - return IsDisabled(); + return disabled; } void @@ -2445,8 +2461,9 @@ nsGenericHTMLFormElement::IsLabelable() const void nsGenericHTMLElement::Click() { - if (HandlingClick()) + if (IsDisabled() || HandlingClick()) { return; + } // Strong in case the event kills it nsCOMPtr<nsIDocument> doc = GetComposedDoc(); |