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/HTMLOptGroupElement.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/HTMLOptGroupElement.cpp')
-rw-r--r-- | dom/html/HTMLOptGroupElement.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/dom/html/HTMLOptGroupElement.cpp b/dom/html/HTMLOptGroupElement.cpp index 63af4e39f..7467c5da3 100644 --- a/dom/html/HTMLOptGroupElement.cpp +++ b/dom/html/HTMLOptGroupElement.cpp @@ -53,14 +53,15 @@ HTMLOptGroupElement::GetEventTargetParent(EventChainPreVisitor& aVisitor) aVisitor.mCanHandle = false; // Do not process any DOM events if the element is disabled // XXXsmaug This is not the right thing to do. But what is? - if (IsDisabled()) { + if (HasAttr(kNameSpaceID_None, nsGkAtoms::disabled)) { return NS_OK; } - if (nsIFrame* frame = GetPrimaryFrame()) { - // FIXME(emilio): This poking at the style of the frame is broken unless we - // flush before every event handling, which we don't really want to. - if (frame->StyleUserInterface()->mUserInput == StyleUserInput::None) { + nsIFrame* frame = GetPrimaryFrame(); + if (frame) { + const nsStyleUserInterface* uiStyle = frame->StyleUserInterface(); + if (uiStyle->mUserInput == StyleUserInput::None || + uiStyle->mUserInput == StyleUserInput::Disabled) { return NS_OK; } } |