Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-24 17:14:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Pass a JS<Element> to the callback in createHTMLCollection.

Browse source
This commit is contained in:
Ms2ger 2014-02-27 13:21:26 +01:00
parent ee549af3ae
commit cd1d81e402
1 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -213,7 +213,7 @@ impl Document {
// http://dom.spec.whatwg.org/#dom-document-getelementsbytagname // http://dom.spec.whatwg.org/#dom-document-getelementsbytagname
pub fn GetElementsByTagName(&self, tag: DOMString) -> JS<HTMLCollection> { pub fn GetElementsByTagName(&self, tag: DOMString) -> JS<HTMLCollection> {
self.createHTMLCollection(|elem| elem.tag_name == tag) self.createHTMLCollection(|elem| elem.get().tag_name == tag)
} }
// http://dom.spec.whatwg.org/#dom-nonelementparentnode-getelementbyid // http://dom.spec.whatwg.org/#dom-nonelementparentnode-getelementbyid
@ -406,18 +406,18 @@ impl Document {
// http://www.whatwg.org/specs/web-apps/current-work/#dom-document-getelementsbyname // http://www.whatwg.org/specs/web-apps/current-work/#dom-document-getelementsbyname
pub fn GetElementsByName(&self, name: DOMString) -> JS<NodeList> { pub fn GetElementsByName(&self, name: DOMString) -> JS<NodeList> {
self.createNodeList(|elem| { self.createNodeList(|elem| {
elem.get_attribute(Null, "name").map_default(false, |attr| { elem.get().get_attribute(Null, "name").map_default(false, |attr| {
attr.get().value_ref() == name attr.get().value_ref() == name
}) })
}) })
} }
pub fn Images(&self) -> JS<HTMLCollection> { pub fn Images(&self) -> JS<HTMLCollection> {
self.createHTMLCollection(|elem| "img" == elem.tag_name) self.createHTMLCollection(|elem| "img" == elem.get().tag_name)
} }
pub fn Embeds(&self) -> JS<HTMLCollection> { pub fn Embeds(&self) -> JS<HTMLCollection> {
self.createHTMLCollection(|elem| "embed" == elem.tag_name) self.createHTMLCollection(|elem| "embed" == elem.get().tag_name)
} }
pub fn Plugins(&self) -> JS<HTMLCollection> { pub fn Plugins(&self) -> JS<HTMLCollection> {
@ -426,31 +426,32 @@ impl Document {
pub fn Links(&self) -> JS<HTMLCollection> { pub fn Links(&self) -> JS<HTMLCollection> {
self.createHTMLCollection(|elem| { self.createHTMLCollection(|elem| {
("a" == elem.tag_name || "area" == elem.tag_name) && ("a" == elem.get().tag_name || "area" == elem.get().tag_name) &&
elem.get_attribute(Null, "href").is_some() elem.get().get_attribute(Null, "href").is_some()
}) })
} }
pub fn Forms(&self) -> JS<HTMLCollection> { pub fn Forms(&self) -> JS<HTMLCollection> {
self.createHTMLCollection(|elem| "form" == elem.tag_name) self.createHTMLCollection(|elem| "form" == elem.get().tag_name)
} }
pub fn Scripts(&self) -> JS<HTMLCollection> { pub fn Scripts(&self) -> JS<HTMLCollection> {
self.createHTMLCollection(|elem| "script" == elem.tag_name) self.createHTMLCollection(|elem| "script" == elem.get().tag_name)
} }
pub fn Anchors(&self) -> JS<HTMLCollection> { pub fn Anchors(&self) -> JS<HTMLCollection> {
self.createHTMLCollection(|elem| { self.createHTMLCollection(|elem| {
"a" == elem.tag_name && elem.get_attribute(Null, "name").is_some() "a" == elem.get().tag_name &&
elem.get().get_attribute(Null, "name").is_some()
}) })
} }
pub fn Applets(&self) -> JS<HTMLCollection> { pub fn Applets(&self) -> JS<HTMLCollection> {
// FIXME: This should be return OBJECT elements containing applets. // FIXME: This should be return OBJECT elements containing applets.
self.createHTMLCollection(|elem| "applet" == elem.tag_name) self.createHTMLCollection(|elem| "applet" == elem.get().tag_name)
} }
pub fn create_collection(&self, callback: |elem: &Element| -> bool) -> ~[JS<Element>] { pub fn create_collection(&self, callback: |elem: &JS<Element>| -> bool) -> ~[JS<Element>] {
let mut elements = ~[]; let mut elements = ~[];
match self.GetDocumentElement() { match self.GetDocumentElement() {
None => {}, None => {},
@ -459,7 +460,7 @@ impl Document {
for child in root.traverse_preorder() { for child in root.traverse_preorder() {
if child.is_element() { if child.is_element() {
let elem: JS<Element> = ElementCast::to(&child); let elem: JS<Element> = ElementCast::to(&child);
if callback(elem.get()) { if callback(&elem) {
elements.push(elem); elements.push(elem);
} }
} }
@ -469,11 +470,11 @@ impl Document {
elements elements
} }
pub fn createHTMLCollection(&self, callback: |elem: &Element| -> bool) -> JS<HTMLCollection> { pub fn createHTMLCollection(&self, callback: |elem: &JS<Element>| -> bool) -> JS<HTMLCollection> {
HTMLCollection::new(&self.window, self.create_collection(callback)) HTMLCollection::new(&self.window, self.create_collection(callback))
} }
pub fn createNodeList(&self, callback: |elem: &Element| -> bool) -> JS<NodeList> { pub fn createNodeList(&self, callback: |elem: &JS<Element>| -> bool) -> JS<NodeList> {
let elements = self.create_collection(callback); let elements = self.create_collection(callback);
let nodes = elements.map(|element| { let nodes = elements.map(|element| {
let node: JS<Node> = NodeCast::from(element); let node: JS<Node> = NodeCast::from(element);