diff options
| author | athenian200 <athenian200@outlook.com> | 2020-05-20 23:25:37 -0500 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-05-23 16:10:40 +0200 |
| commit | c4ed56660230a124fa3457cd5f789e78a3188515 (patch) | |
| tree | 0edc55305d449c3851ecc2ad1df8961cc2df7a3b /layout/style | |
| parent | 99c2e698d2a3c56649e42d8d2133706cd8c9501e (diff) | |
| download | uxp-c4ed56660230a124fa3457cd5f789e78a3188515.tar.gz | |
Revert "Merge pull request #1357 from athenian200/form-disabled-issue"
This reverts commit ed88b99849156004c04e4a0c87ea9b2360ef19b6, reversing
changes made to c4b0715baaffc541670fd1158557aa7e61e521d3.
Diffstat (limited to 'layout/style')
| -rw-r--r-- | layout/style/nsCSSProps.cpp | 2 | ||||
| -rw-r--r-- | layout/style/nsStyleConsts.h | 2 | ||||
| -rw-r--r-- | layout/style/res/forms.css | 1 | ||||
| -rw-r--r-- | layout/style/test/property_database.js | 2 |
4 files changed, 6 insertions, 1 deletions
diff --git a/layout/style/nsCSSProps.cpp b/layout/style/nsCSSProps.cpp index 289a16ecd0..ac2978c277 100644 --- a/layout/style/nsCSSProps.cpp +++ b/layout/style/nsCSSProps.cpp @@ -2189,6 +2189,8 @@ const KTableEntry nsCSSProps::kUserFocusKTable[] = { const KTableEntry nsCSSProps::kUserInputKTable[] = { { eCSSKeyword_none, StyleUserInput::None }, + { eCSSKeyword_enabled, StyleUserInput::Enabled }, + { eCSSKeyword_disabled, StyleUserInput::Disabled }, { eCSSKeyword_auto, StyleUserInput::Auto }, { eCSSKeyword_UNKNOWN, -1 } }; diff --git a/layout/style/nsStyleConsts.h b/layout/style/nsStyleConsts.h index 5412eed269..6d207aec9b 100644 --- a/layout/style/nsStyleConsts.h +++ b/layout/style/nsStyleConsts.h @@ -241,6 +241,8 @@ enum class StyleUserSelect : uint8_t { // user-input enum class StyleUserInput : uint8_t { None, + Enabled, + Disabled, Auto, }; diff --git a/layout/style/res/forms.css b/layout/style/res/forms.css index 95025221d1..e7566e183f 100644 --- a/layout/style/res/forms.css +++ b/layout/style/res/forms.css @@ -425,6 +425,7 @@ optgroup:disabled, select:disabled:disabled /* Need the pseudo-class twice to have the specificity be at least the same as select[size][multiple] above */ { + -moz-user-input: disabled; color: GrayText; background-color: ThreeDLightShadow; cursor: inherit; diff --git a/layout/style/test/property_database.js b/layout/style/test/property_database.js index 3486d15d07..c75f7b498f 100644 --- a/layout/style/test/property_database.js +++ b/layout/style/test/property_database.js @@ -2203,7 +2203,7 @@ var gCSSProperties = { inherited: true, type: CSS_TYPE_LONGHAND, initial_values: [ "auto" ], - other_values: [ "none" ], + other_values: [ "none", "enabled", "disabled" ], invalid_values: [] }, "-moz-user-modify": { |