Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-15 20:04:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup Document::Title.

Browse source
This commit is contained in:
Ms2ger 2015-03-30 14:12:05 +02:00
parent dbd16932e6
commit 879c3710f4
1 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

26
components/script/dom/document.rs
View file

@ -1118,21 +1118,21 @@ impl<'a> DocumentMethods for JSRef<'a, Document> {
// TODO: Support root SVG namespace: https://github.com/servo/servo/issues/5315 // TODO: Support root SVG namespace: https://github.com/servo/servo/issues/5315
// http://www.whatwg.org/specs/web-apps/current-work/#document.title // http://www.whatwg.org/specs/web-apps/current-work/#document.title
fn Title(self) -> DOMString { fn Title(self) -> DOMString {
let mut title = String::new(); let title_element = self.GetDocumentElement().root().and_then(|root| {
self.GetDocumentElement().root().map(|root| { NodeCast::from_ref(root.get_unsound_ref_forever())
let root: JSRef<Node> = NodeCast::from_ref(root.r()); .traverse_preorder()
root.traverse_preorder()
.find(|node| node.type_id() == NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLTitleElement))) .find(|node| node.type_id() == NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLTitleElement)))
.map(|title_elem| {
let children = title_elem.children().filter_map(|n| {
let t: Option<JSRef<Text>> = TextCast::to_ref(n);
t
});
for text in children {
title.push_str(&text.characterdata().data());
}
});
}); });
let mut title = String::new();
if let Some(title_element) = title_element {
for child in title_element.children() {
if let Some(text) = TextCast::to_ref(child) {
title.push_str(&text.characterdata().data());
}
}
}
let v: Vec<&str> = split_html_space_chars(&title).collect(); let v: Vec<&str> = split_html_space_chars(&title).collect();
v.connect(" ") v.connect(" ")
} }