summaryrefslogtreecommitdiffstats
path: root/layout/forms/nsImageControlFrame.cpp
diff options
context:
space:
mode:
authorMoonchild <moonchild@palemoon.org>2020-01-28 23:03:48 +0000
committerGitHub <noreply@github.com>2020-01-28 23:03:48 +0000
commited88b99849156004c04e4a0c87ea9b2360ef19b6 (patch)
tree85910991cfd39dc19da5e6ed5526d1a6e6c5ff0a /layout/forms/nsImageControlFrame.cpp
parentc4b0715baaffc541670fd1158557aa7e61e521d3 (diff)
parent7a697172f36656126d6e415d91b4e260229ee37f (diff)
downloadUXP-ed88b99849156004c04e4a0c87ea9b2360ef19b6.tar
UXP-ed88b99849156004c04e4a0c87ea9b2360ef19b6.tar.gz
UXP-ed88b99849156004c04e4a0c87ea9b2360ef19b6.tar.lz
UXP-ed88b99849156004c04e4a0c87ea9b2360ef19b6.tar.xz
UXP-ed88b99849156004c04e4a0c87ea9b2360ef19b6.zip
Merge pull request #1357 from athenian200/form-disabled-issue
Forms: Click() isn't executing properly when elements are defined disabled
Diffstat (limited to 'layout/forms/nsImageControlFrame.cpp')
-rw-r--r--layout/forms/nsImageControlFrame.cpp8
1 files changed, 1 insertions, 7 deletions
diff --git a/layout/forms/nsImageControlFrame.cpp b/layout/forms/nsImageControlFrame.cpp
index 212fa9356..8aef41538 100644
--- a/layout/forms/nsImageControlFrame.cpp
+++ b/layout/forms/nsImageControlFrame.cpp
@@ -150,15 +150,9 @@ nsImageControlFrame::HandleEvent(nsPresContext* aPresContext,
return NS_OK;
}
- // do we have user-input style?
- const nsStyleUserInterface* uiStyle = StyleUserInterface();
- if (uiStyle->mUserInput == StyleUserInput::None ||
- uiStyle->mUserInput == StyleUserInput::Disabled) {
+ if (IsContentDisabled()) {
return nsFrame::HandleEvent(aPresContext, aEvent, aEventStatus);
}
- if (mContent->HasAttr(kNameSpaceID_None, nsGkAtoms::disabled)) { // XXX cache disabled
- return NS_OK;
- }
*aEventStatus = nsEventStatus_eIgnore;