Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 06:00:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #8112 - nerith:buttontype, r=frewsxcv

Browse source 
Remove Button prefix from names of variants of ButtonType enum

Fixes #8106.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8112)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-10-20 21:28:38 -06:00
commit fde40edfdc
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
components/script/dom/htmlbuttonelement.rs
View file

@ -28,10 +28,10 @@ use util::str::DOMString;
#[allow(dead_code)]
#[derive(HeapSizeOf)]
enum ButtonType {
ButtonSubmit,
ButtonReset,
ButtonButton,
ButtonMenu
Submit,
Reset,
Button,
Menu
}
#[dom_struct]
@ -49,7 +49,7 @@ impl HTMLButtonElement {
HTMLElement::new_inherited_with_state(IN_ENABLED_STATE,
localName, prefix, document),
//TODO: implement button_type in attribute_mutated
button_type: Cell::new(ButtonType::ButtonSubmit)
button_type: Cell::new(ButtonType::Submit)
}
}
@ -212,7 +212,7 @@ impl<'a> Activatable for &'a HTMLButtonElement {
let ty = self.button_type.get();
match ty {
//https://html.spec.whatwg.org/multipage/#attr-button-type-submit-state
ButtonType::ButtonSubmit => {
ButtonType::Submit => {
self.form_owner().map(|o| {
o.r().submit(SubmittedFrom::NotFromFormSubmitMethod,
FormSubmitter::ButtonElement(self.clone()))