mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
Auto merge of #9105 - jdm:buttoneventsintermittent, r=nox
Implement support for modifying the type attribute of <button> https://github.com/servo/servo/pull/9100 <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9105) <!-- Reviewable:end -->
This commit is contained in:
commit
77b23d1bb9
5 changed files with 19 additions and 21 deletions
|
@ -27,7 +27,6 @@ use string_cache::Atom;
|
|||
use util::str::DOMString;
|
||||
|
||||
#[derive(JSTraceable, PartialEq, Copy, Clone)]
|
||||
#[allow(dead_code)]
|
||||
#[derive(HeapSizeOf)]
|
||||
enum ButtonType {
|
||||
Submit,
|
||||
|
@ -50,7 +49,6 @@ impl HTMLButtonElement {
|
|||
htmlelement:
|
||||
HTMLElement::new_inherited_with_state(IN_ENABLED_STATE,
|
||||
localName, prefix, document),
|
||||
//TODO: implement button_type in attribute_mutated
|
||||
button_type: Cell::new(ButtonType::Submit)
|
||||
}
|
||||
}
|
||||
|
@ -162,6 +160,22 @@ impl VirtualMethods for HTMLButtonElement {
|
|||
}
|
||||
}
|
||||
},
|
||||
&atom!("type") => {
|
||||
match mutation {
|
||||
AttributeMutation::Set(_) => {
|
||||
let value = match &**attr.value() {
|
||||
"reset" => ButtonType::Reset,
|
||||
"button" => ButtonType::Button,
|
||||
"menu" => ButtonType::Menu,
|
||||
_ => ButtonType::Submit,
|
||||
};
|
||||
self.button_type.set(value);
|
||||
}
|
||||
AttributeMutation::Removed => {
|
||||
self.button_type.set(ButtonType::Submit);
|
||||
}
|
||||
}
|
||||
}
|
||||
_ => {},
|
||||
}
|
||||
}
|
||||
|
|
|
@ -330,6 +330,7 @@ macro_rules! global_event_handlers(
|
|||
event_handler!(keyup, GetOnkeyup, SetOnkeyup);
|
||||
event_handler!(input, GetOninput, SetOninput);
|
||||
event_handler!(change, GetOnchange, SetOnchange);
|
||||
event_handler!(reset, GetOnreset, SetOnreset);
|
||||
event_handler!(submit, GetOnsubmit, SetOnsubmit);
|
||||
)
|
||||
);
|
||||
|
|
|
@ -31,6 +31,7 @@ interface GlobalEventHandlers {
|
|||
attribute EventHandler onkeypress;
|
||||
attribute EventHandler onkeyup;
|
||||
attribute EventHandler onchange;
|
||||
attribute EventHandler onreset;
|
||||
attribute EventHandler onsubmit;
|
||||
};
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue