mirror of
https://github.com/servo/servo.git
synced 2025-06-11 10:00:18 +00:00
05bfb8d07a
This came out of a conversation with nox in IRC: https://mozilla.logbot.info/servo/20171201#c13946454-c13946594 The code I was working on which motivated this change is here: https://github.com/servo/servo/pull/19461 Previously, InputType::Text was used to represent several different values of the type attribute on an input element. If an input element doesn't have a type attribute, or its type attribute doesn't contain a recognised value, then the input's type defaults to "text". Before this change, there were a number of checks in the code which directly looked at the type attribute. If those checks matched against the value "text", then they were potentially buggy, since an input with type=invalid should also behave like an input with type=text. Rather than have every conditional which cares about the input type also have to deal with invalid input types, we can convert the type attribute to an InputType enum once, and then match against the enum. A secondary benefit is that the compiler can tell us whether we've missed branches in a match expression. While working on this I discovered that the HTMLInputElement::value_mode() method misses a case for inputs with type=hidden (this resulted in a failing WPT test passing). I've also implemented the Default trait for InputType, so we now only have one place in the code which knows that InputType::Text is the default, where previously there were several.
106 lines
4 KiB
Rust
106 lines
4 KiB
Rust
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
use dom::bindings::codegen::Bindings::HTMLInputElementBinding::HTMLInputElementMethods;
|
|
use dom::bindings::codegen::Bindings::NodeListBinding::NodeListMethods;
|
|
use dom::bindings::codegen::Bindings::RadioNodeListBinding;
|
|
use dom::bindings::codegen::Bindings::RadioNodeListBinding::RadioNodeListMethods;
|
|
use dom::bindings::inheritance::Castable;
|
|
use dom::bindings::reflector::reflect_dom_object;
|
|
use dom::bindings::root::{Dom, DomRoot};
|
|
use dom::bindings::str::DOMString;
|
|
use dom::htmlinputelement::{HTMLInputElement, InputType};
|
|
use dom::node::Node;
|
|
use dom::nodelist::{NodeList, NodeListType};
|
|
use dom::window::Window;
|
|
use dom_struct::dom_struct;
|
|
|
|
#[dom_struct]
|
|
pub struct RadioNodeList {
|
|
node_list: NodeList,
|
|
}
|
|
|
|
impl RadioNodeList {
|
|
#[allow(unrooted_must_root)]
|
|
fn new_inherited(list_type: NodeListType) -> RadioNodeList {
|
|
RadioNodeList {
|
|
node_list: NodeList::new_inherited(list_type)
|
|
}
|
|
}
|
|
|
|
#[allow(unrooted_must_root)]
|
|
pub fn new(window: &Window, list_type: NodeListType) -> DomRoot<RadioNodeList> {
|
|
reflect_dom_object(Box::new(RadioNodeList::new_inherited(list_type)),
|
|
window,
|
|
RadioNodeListBinding::Wrap)
|
|
}
|
|
|
|
pub fn new_simple_list<T>(window: &Window, iter: T) -> DomRoot<RadioNodeList>
|
|
where T: Iterator<Item=DomRoot<Node>> {
|
|
RadioNodeList::new(window, NodeListType::Simple(iter.map(|r| Dom::from_ref(&*r)).collect()))
|
|
}
|
|
|
|
// FIXME: This shouldn't need to be implemented here since NodeList (the parent of
|
|
// RadioNodeList) implements Length
|
|
// https://github.com/servo/servo/issues/5875
|
|
pub fn Length(&self) -> u32 {
|
|
self.node_list.Length()
|
|
}
|
|
}
|
|
|
|
impl RadioNodeListMethods for RadioNodeList {
|
|
// https://html.spec.whatwg.org/multipage/#dom-radionodelist-value
|
|
fn Value(&self) -> DOMString {
|
|
self.upcast::<NodeList>().as_simple_list().iter().filter_map(|node| {
|
|
// Step 1
|
|
node.downcast::<HTMLInputElement>().and_then(|input| {
|
|
if input.input_type() == InputType::Radio && input.Checked() {
|
|
// Step 3-4
|
|
let value = input.Value();
|
|
Some(if value.is_empty() { DOMString::from("on") } else { value })
|
|
} else {
|
|
None
|
|
}
|
|
})
|
|
}).next()
|
|
// Step 2
|
|
.unwrap_or(DOMString::from(""))
|
|
}
|
|
|
|
// https://html.spec.whatwg.org/multipage/#dom-radionodelist-value
|
|
fn SetValue(&self, value: DOMString) {
|
|
for node in self.upcast::<NodeList>().as_simple_list().iter() {
|
|
// Step 1
|
|
if let Some(input) = node.downcast::<HTMLInputElement>() {
|
|
match input.input_type() {
|
|
InputType::Radio if value == DOMString::from("on") => {
|
|
// Step 2
|
|
let val = input.Value();
|
|
if val.is_empty() || val == value {
|
|
input.SetChecked(true);
|
|
return;
|
|
}
|
|
}
|
|
InputType::Radio => {
|
|
// Step 2
|
|
if input.Value() == value {
|
|
input.SetChecked(true);
|
|
return;
|
|
}
|
|
}
|
|
_ => {}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
// FIXME: This shouldn't need to be implemented here since NodeList (the parent of
|
|
// RadioNodeList) implements IndexedGetter.
|
|
// https://github.com/servo/servo/issues/5875
|
|
//
|
|
// https://dom.spec.whatwg.org/#dom-nodelist-item
|
|
fn IndexedGetter(&self, index: u32) -> Option<DomRoot<Node>> {
|
|
self.node_list.IndexedGetter(index)
|
|
}
|
|
}
|