diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2020-01-03 17:11:32 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-03 17:11:32 -0500 |
commit | 33bea4a089f8392d18face68a45ef45f2c0f1eb6 (patch) | |
tree | d37bec6367430fe72aa6b63e9b8eac3d0fc1155f | |
parent | 7d986a2eb1152800fbe8d79ca4ebf812d48e377a (diff) | |
parent | 3da12514886c29f24d9d33db908473a1896035f5 (diff) | |
download | servo-33bea4a089f8392d18face68a45ef45f2c0f1eb6.tar.gz servo-33bea4a089f8392d18face68a45ef45f2c0f1eb6.zip |
Auto merge of #25409 - pshaughn:nomenubutton, r=jdm
Remove "menu" from legal button types
Just cleanup from a spec change, passing a WPT test for it.
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #25382
<!-- Either: -->
- [X] There are tests for these changes OR
<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->
<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
-rwxr-xr-x | components/script/dom/htmlbuttonelement.rs | 4 | ||||
-rw-r--r-- | tests/wpt/metadata/html/semantics/forms/the-button-element/button-menu-historical.html.ini | 5 |
2 files changed, 1 insertions, 8 deletions
diff --git a/components/script/dom/htmlbuttonelement.rs b/components/script/dom/htmlbuttonelement.rs index 1406ceb870b..6a60a88b25c 100755 --- a/components/script/dom/htmlbuttonelement.rs +++ b/components/script/dom/htmlbuttonelement.rs @@ -34,7 +34,6 @@ enum ButtonType { Submit, Reset, Button, - Menu, } #[dom_struct] @@ -97,7 +96,7 @@ impl HTMLButtonElementMethods for HTMLButtonElement { } // https://html.spec.whatwg.org/multipage/#dom-button-type - make_enumerated_getter!(Type, "type", "submit", "reset" | "button" | "menu"); + make_enumerated_getter!(Type, "type", "submit", "reset" | "button"); // https://html.spec.whatwg.org/multipage/#dom-button-type make_setter!(SetType, "type"); @@ -216,7 +215,6 @@ impl VirtualMethods for HTMLButtonElement { let value = match &**attr.value() { "reset" => ButtonType::Reset, "button" => ButtonType::Button, - "menu" => ButtonType::Menu, _ => ButtonType::Submit, }; self.button_type.set(value); diff --git a/tests/wpt/metadata/html/semantics/forms/the-button-element/button-menu-historical.html.ini b/tests/wpt/metadata/html/semantics/forms/the-button-element/button-menu-historical.html.ini deleted file mode 100644 index b548f3cb3ed..00000000000 --- a/tests/wpt/metadata/html/semantics/forms/the-button-element/button-menu-historical.html.ini +++ /dev/null @@ -1,5 +0,0 @@ -[button-menu-historical.html] - type: testharness - [button.type reflects properly] - expected: FAIL - |