pep/xmpp-rs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

xhtml: Automatically flatten on parsing.

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2019-09-04 18:14:39 +02:00
parent 63d0265284
commit f528a45568
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/xhtml.rs
View file

@ -41,7 +41,7 @@ impl XhtmlIm {
} }
/// Removes all unknown elements. /// Removes all unknown elements.
pub fn flatten(self) -> XhtmlIm { fn flatten(self) -> XhtmlIm {
let mut bodies = HashMap::new(); let mut bodies = HashMap::new();
for (lang, body) in self.bodies { for (lang, body) in self.bodies {
let children = body.children.into_iter().fold(vec![], |mut acc, child| { let children = body.children.into_iter().fold(vec![], |mut acc, child| {
@ -91,7 +91,7 @@ impl TryFrom<Element> for XhtmlIm {
} }
} }
Ok(XhtmlIm { bodies }) Ok(XhtmlIm { bodies }.flatten())
} }
} }
@ -237,7 +237,7 @@ impl Tag {
let style = write_attr(get_style_string(style), "style"); let style = write_attr(get_style_string(style), "style");
format!("<span{}>{}</span>", style, children_to_html(children)) format!("<span{}>{}</span>", style, children_to_html(children))
} }
Tag::Strong { children } => format!("<strong>{}</strong>", children.into_iter().map(|child| child.to_html()).collect::<Vec<_>>().join("")), Tag::Strong { children } => format!("<strong>{}</strong>", children_to_html(children)),
Tag::Ul { style, children } => { Tag::Ul { style, children } => {
let style = write_attr(get_style_string(style), "style"); let style = write_attr(get_style_string(style), "style");
format!("<ul{}>{}</ul>", style, children_to_html(children)) format!("<ul{}>{}</ul>", style, children_to_html(children))