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

'type' attribute on HTMLInputElement should be stored as an Atom

Browse source 
Fixes #8180
This commit is contained in:
Corey Farwell 2015-10-29 08:46:32 -04:00
parent 31e6f1b4a1
commit 606d4cf443
2 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/script/dom/htmlelement.rs
View file

@ -345,7 +345,7 @@ impl HTMLElement {
NodeTypeId::Element(ElementTypeId::HTMLElement(type_id)) => NodeTypeId::Element(ElementTypeId::HTMLElement(type_id)) =>
match type_id { match type_id {
HTMLElementTypeId::HTMLInputElement => HTMLElementTypeId::HTMLInputElement =>
self.downcast::<HTMLInputElement>().unwrap().Type() != "hidden", self.downcast::<HTMLInputElement>().unwrap().type_() != atom!("hidden"),
HTMLElementTypeId::HTMLButtonElement | HTMLElementTypeId::HTMLButtonElement |
HTMLElementTypeId::HTMLMeterElement | HTMLElementTypeId::HTMLMeterElement |
HTMLElementTypeId::HTMLOutputElement | HTMLElementTypeId::HTMLOutputElement |

25
components/script/dom/htmlinputelement.rs
View file

@ -127,6 +127,12 @@ impl HTMLInputElement {
let element = HTMLInputElement::new_inherited(localName, prefix, document); let element = HTMLInputElement::new_inherited(localName, prefix, document);
Node::reflect_node(box element, document, HTMLInputElementBinding::Wrap) Node::reflect_node(box element, document, HTMLInputElementBinding::Wrap)
} }
pub fn type_(&self) -> Atom {
self.upcast::<Element>()
.get_attribute(&ns!(""), &atom!("type"))
.map_or_else(|| atom!(""), |a| a.value().as_atom().to_owned())
}
} }
pub trait LayoutHTMLInputElementHelpers { pub trait LayoutHTMLInputElementHelpers {
@ -268,7 +274,7 @@ impl HTMLInputElementMethods for HTMLInputElement {
("submit") | ("image") | ("reset") | ("button")); ("submit") | ("image") | ("reset") | ("button"));
// https://html.spec.whatwg.org/multipage/#dom-input-type // https://html.spec.whatwg.org/multipage/#dom-input-type
make_setter!(SetType, "type"); make_atomic_setter!(SetType, "type");
// https://html.spec.whatwg.org/multipage/#dom-input-value // https://html.spec.whatwg.org/multipage/#dom-input-value
fn Value(&self) -> DOMString { fn Value(&self) -> DOMString {
@ -337,7 +343,7 @@ impl HTMLInputElementMethods for HTMLInputElement {
// https://html.spec.whatwg.org/multipage/#dom-lfe-labels // https://html.spec.whatwg.org/multipage/#dom-lfe-labels
fn Labels(&self) -> Root<NodeList> { fn Labels(&self) -> Root<NodeList> {
if self.Type() == "hidden" { if &*self.type_() == "hidden" {
let window = window_from_node(self); let window = window_from_node(self);
NodeList::empty(&window) NodeList::empty(&window)
} else { } else {
@ -403,7 +409,7 @@ impl HTMLInputElement {
} }
pub fn get_form_datum(&self, submitter: Option<FormSubmitter>) -> Option<FormDatum> { pub fn get_form_datum(&self, submitter: Option<FormSubmitter>) -> Option<FormDatum> {
let ty = self.Type(); let ty = self.type_();
let name = self.Name(); let name = self.Name();
let is_submitter = match submitter { let is_submitter = match submitter {
Some(FormSubmitter::InputElement(s)) => { Some(FormSubmitter::InputElement(s)) => {
@ -434,7 +440,7 @@ impl HTMLInputElement {
} }
} }
Some(FormDatum { Some(FormDatum {
ty: ty, ty: DOMString(ty.to_string()),
name: name, name: name,
value: value value: value
}) })
@ -585,6 +591,7 @@ impl VirtualMethods for HTMLInputElement {
match name { match name {
&atom!(name) => AttrValue::from_atomic(value), &atom!(name) => AttrValue::from_atomic(value),
&atom!("size") => AttrValue::from_limited_u32(value, DEFAULT_INPUT_SIZE), &atom!("size") => AttrValue::from_limited_u32(value, DEFAULT_INPUT_SIZE),
&atom!(type) => AttrValue::from_atomic(value),
_ => self.super_type().unwrap().parse_plain_attribute(name, value), _ => self.super_type().unwrap().parse_plain_attribute(name, value),
} }
} }
@ -856,11 +863,11 @@ impl Activatable for HTMLInputElement {
let inputs = node.query_selector_iter(DOMString("input".to_owned())).unwrap() let inputs = node.query_selector_iter(DOMString("input".to_owned())).unwrap()
.filter_map(Root::downcast::<HTMLInputElement>) .filter_map(Root::downcast::<HTMLInputElement>)
.filter(|input| { .filter(|input| {
input.form_owner() == owner && match &*input.Type() { input.form_owner() == owner && match input.type_() {
"text" | "search" | "url" | "tel" | atom!("text") | atom!("search") | atom!("url") | atom!("tel") |
"email" | "password" | "datetime" | atom!("email") | atom!("password") | atom!("datetime") |
"date" | "month" | "week" | "time" | atom!("date") | atom!("month") | atom!("week") | atom!("time") |
"datetime-local" | "number" atom!("datetime-local") | atom!("number")
=> true, => true,
_ => false _ => false
} }