diff --git a/src/components/script/dom/document.rs b/src/components/script/dom/document.rs index 0829b08e722..ea236597758 100644 --- a/src/components/script/dom/document.rs +++ b/src/components/script/dom/document.rs @@ -450,7 +450,7 @@ impl Document { } } let filter = ~ImagesFilter; - HTMLCollection::create_live(&self.window, &NodeCast::from(abstract_self), filter) + HTMLCollection::create(&self.window, &NodeCast::from(abstract_self), filter) } pub fn Embeds(&self, abstract_self: &JS) -> JS { @@ -462,7 +462,7 @@ impl Document { } } let filter = ~EmbedsFilter; - HTMLCollection::create_live(&self.window, &NodeCast::from(abstract_self), filter) + HTMLCollection::create(&self.window, &NodeCast::from(abstract_self), filter) } pub fn Plugins(&self, abstract_self: &JS) -> JS { @@ -480,7 +480,7 @@ impl Document { } } let filter = ~LinksFilter; - HTMLCollection::create_live(&self.window, &NodeCast::from(abstract_self), filter) + HTMLCollection::create(&self.window, &NodeCast::from(abstract_self), filter) } pub fn Forms(&self, abstract_self: &JS) -> JS { @@ -492,7 +492,7 @@ impl Document { } } let filter = ~FormsFilter; - HTMLCollection::create_live(&self.window, &NodeCast::from(abstract_self), filter) + HTMLCollection::create(&self.window, &NodeCast::from(abstract_self), filter) } pub fn Scripts(&self, abstract_self: &JS) -> JS { @@ -504,7 +504,7 @@ impl Document { } } let filter = ~ScriptsFilter; - HTMLCollection::create_live(&self.window, &NodeCast::from(abstract_self), filter) + HTMLCollection::create(&self.window, &NodeCast::from(abstract_self), filter) } pub fn Anchors(&self, abstract_self: &JS) -> JS { @@ -516,7 +516,7 @@ impl Document { } } let filter = ~AnchorsFilter; - HTMLCollection::create_live(&self.window, &NodeCast::from(abstract_self), filter) + HTMLCollection::create(&self.window, &NodeCast::from(abstract_self), filter) } pub fn Applets(&self, abstract_self: &JS) -> JS { @@ -528,7 +528,7 @@ impl Document { } } let filter = ~AppletsFilter; - HTMLCollection::create_live(&self.window, &NodeCast::from(abstract_self), filter) + HTMLCollection::create(&self.window, &NodeCast::from(abstract_self), filter) } pub fn create_collection(&self, callback: |elem: &JS| -> Option>) -> ~[JS] { diff --git a/src/components/script/dom/htmlcollection.rs b/src/components/script/dom/htmlcollection.rs index d54ec0c0aff..eb56ebac542 100644 --- a/src/components/script/dom/htmlcollection.rs +++ b/src/components/script/dom/htmlcollection.rs @@ -51,23 +51,10 @@ impl HTMLCollection { } impl HTMLCollection { - pub fn create_live(window: &JS, root: &JS, filter: ~CollectionFilter) -> JS { + pub fn create(window: &JS, root: &JS, filter: ~CollectionFilter) -> JS { HTMLCollection::new(window, Live(root.clone(), filter)) } - pub fn create(window: &JS, root: &JS, predicate: |elem: &JS| -> bool) -> JS { - let mut elements = ~[]; - for child in root.traverse_preorder() { - if child.is_element() { - let elem: JS = ElementCast::to(&child).unwrap(); - if predicate(&elem) { - elements.push(elem); - } - } - } - HTMLCollection::new(window, Static(elements)) - } - pub fn by_tag_name(window: &JS, root: &JS, tag: DOMString) -> JS { struct TagNameFilter { @@ -81,7 +68,7 @@ impl HTMLCollection { let filter = TagNameFilter { tag: tag }; - HTMLCollection::create_live(window, root, ~filter) + HTMLCollection::create(window, root, ~filter) } pub fn by_tag_name_ns(window: &JS, root: &JS, tag: DOMString, @@ -99,7 +86,7 @@ impl HTMLCollection { tag: tag, namespace: namespace }; - HTMLCollection::create_live(window, root, ~filter) + HTMLCollection::create(window, root, ~filter) } pub fn by_class_name(window: &JS, root: &JS, classes: DOMString) @@ -115,7 +102,7 @@ impl HTMLCollection { let filter = ClassNameFilter { classes: classes.split(' ').map(|class| class.into_owned()).to_owned_vec() }; - HTMLCollection::create_live(window, root, ~filter) + HTMLCollection::create(window, root, ~filter) } } diff --git a/src/components/script/dom/htmldatalistelement.rs b/src/components/script/dom/htmldatalistelement.rs index aab9aff5b94..7011a9fe721 100644 --- a/src/components/script/dom/htmldatalistelement.rs +++ b/src/components/script/dom/htmldatalistelement.rs @@ -50,6 +50,6 @@ impl HTMLDataListElement { } let node: JS = NodeCast::from(abstract_self); let filter = ~HTMLDataListOptionsFilter; - HTMLCollection::create_live(&window_from_node(&node), &node, filter) + HTMLCollection::create(&window_from_node(&node), &node, filter) } } diff --git a/src/components/script/dom/htmlfieldsetelement.rs b/src/components/script/dom/htmlfieldsetelement.rs index fa1cd8e4c2f..9474481a6a9 100644 --- a/src/components/script/dom/htmlfieldsetelement.rs +++ b/src/components/script/dom/htmlfieldsetelement.rs @@ -81,7 +81,7 @@ impl HTMLFieldSetElement { } let node: JS = NodeCast::from(abstract_self); let filter = ~ElementsFilter; - HTMLCollection::create_live(&window_from_node(&node), &node, ~filter) + HTMLCollection::create(&window_from_node(&node), &node, filter) } pub fn WillValidate(&self) -> bool {