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

auto merge of #2632 : brunoabinader/servo/document-queryselectorall, r=Ms2ger

Browse source 
Spec:
http://dom.spec.whatwg.org/#dom-parentnode-queryselectorall

Closes #851.
This commit is contained in:
bors-servo 2014-06-11 16:05:04 -04:00
commit baa97fe6e5
6 changed files with 116 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/components/script/dom/node.rs
View file

@ -399,6 +399,7 @@ pub trait NodeHelpers {
fn get_content_boxes(&self) -> Vec<Rect<Au>>;
fn query_selector(&self, selectors: DOMString) -> Fallible<Option<Temporary<Element>>>;
fn query_selector_all(&self, selectors: DOMString) -> Fallible<Temporary<NodeList>>;
fn remove_self(&self);
}
@ -569,9 +570,9 @@ impl<'a> NodeHelpers for JSRef<'a, Node> {
None => return Err(Syntax),
// Step 3.
Some(ref selectors) => {
let root = self.ancestors().last().unwrap_or(self.clone());
for selector in selectors.iter() {
assert!(selector.pseudo_element.is_none());
let root = self.ancestors().last().unwrap_or(self.clone());
for node in root.traverse_preorder().filter(|node| node.is_element()) {
let mut _shareable: bool = false;
if matches_compound_selector(selector.compound_selectors.deref(), &node, &mut _shareable) {
@ -585,6 +586,32 @@ impl<'a> NodeHelpers for JSRef<'a, Node> {
Ok(None)
}
// http://dom.spec.whatwg.org/#dom-parentnode-queryselectorall
fn query_selector_all(&self, selectors: DOMString) -> Fallible<Temporary<NodeList>> {
// Step 1.
let mut nodes = vec!();
let root = self.ancestors().last().unwrap_or(self.clone());
let namespace = NamespaceMap::new();
match parse_selector_list(tokenize(selectors.as_slice()).map(|(token, _)| token).collect(), &namespace) {
// Step 2.
None => return Err(Syntax),
// Step 3.
Some(ref selectors) => {
for selector in selectors.iter() {
assert!(selector.pseudo_element.is_none());
for node in root.traverse_preorder().filter(|node| node.is_element()) {
let mut _shareable: bool = false;
if matches_compound_selector(selector.compound_selectors.deref(), &node, &mut _shareable) {
nodes.push(node.clone())
}
}
}
}
}
let window = window_from_node(self).root();
Ok(NodeList::new_simple_list(&window.root_ref(), nodes))
}
fn ancestors(&self) -> AncestorIterator {
AncestorIterator {
current: self.parent_node.get().map(|node| (*node.root()).clone()),