mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Flatten list for editor

This commit is contained in:
M66B 2022-05-22 09:33:27 +02:00
parent 00e54f0b08
commit e643271f13
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/eu/faircode/email/HtmlHelper.java
View File

@ -1269,8 +1269,8 @@ public class HtmlHelper {
// Lists
for (Element e : document.select("ol,ul,blockquote")) {
Element parent = e.parent();
if (view) {
Element parent = e.parent();
if ("blockquote".equals(e.tagName()) || parent == null ||
!("li".equals(parent.tagName()) ||
"ol".equals(parent.tagName()) ||
@ -1299,6 +1299,20 @@ public class HtmlHelper {
}
e.attr("dir", rtl > ltr ? "rtl" : "ltr");
}
// Flatten list for editor
if (parent != null && "li".equals(parent.tagName())) {
List<Node> children = parent.childNodes();
for (Node child : children) {
child.remove();
if (child instanceof Element &&
"ol".equals(child.nodeName()) || "ul".equals(child.nodeName()))
parent.before(child);
else
parent.before(document.createElement("li").appendChild(child));
}
parent.remove();
}
}
}