forks
/
arsd
mirror of https://github.com/adamdruppe/arsd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

more pretty printing html (note this still changes content!)

This commit is contained in:
Adam D. Ruppe 2017-11-18 23:48:05 -05:00
parent f5eb7297ff
commit 6e0b22583f
1 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
dom.d
View File

@ -3177,18 +3177,19 @@ class Element {
// for simple `<collection><item>text</item><item>text</item></collection>`, let's // for simple `<collection><item>text</item><item>text</item></collection>`, let's
// just keep them on the same line // just keep them on the same line
if(children.length == 1 && children[0].nodeType == NodeType.Text && children[0].nodeValue.strip.length) if(allAreInlineHtml(children)) {
s ~= children[0].toString(); foreach(child; children) {
else s ~= child.toString();
foreach(child; children) { }
assert(child !is null); } else {
foreach(child; children) {
assert(child !is null);
s ~= child.toPrettyString(insertComments, indentationLevel + 1, indentWith); s ~= child.toPrettyString(insertComments, indentationLevel + 1, indentWith);
} }
// see comment above
if(!(children.length == 1 && children[0].nodeType == NodeType.Text && children[0].nodeValue.strip.length))
s ~= toPrettyStringIndent(insertComments, indentationLevel, indentWith); s ~= toPrettyStringIndent(insertComments, indentationLevel, indentWith);
}
s ~= "</"; s ~= "</";
s ~= tagName; s ~= tagName;
@ -5117,12 +5118,17 @@ struct DomMutationEvent {
} }
private enum static string[] selfClosedElements = [ private immutable static string[] selfClosedElements = [
// html 4 // html 4
"img", "hr", "input", "br", "col", "link", "meta", "img", "hr", "input", "br", "col", "link", "meta",
// html 5 // html 5
"source" ]; "source" ];
private immutable static string[] inlineElements = [
"span", "strong", "em", "b", "i", "a"
];
static import std.conv; static import std.conv;
///. ///.
@ -7044,6 +7050,21 @@ unittest {
assert(stringplate.expand.innerHTML == `<div id="bar"><div class="foo">$foo</div><div class="baz">$baz</div></div>`); assert(stringplate.expand.innerHTML == `<div id="bar"><div class="foo">$foo</div><div class="baz">$baz</div></div>`);
} }
+/ +/
bool allAreInlineHtml(const(Element)[] children) {
foreach(child; children) {
if(child.nodeType == NodeType.Text && child.nodeValue.strip.length) {
// cool
} else if(child.tagName.isInArray(inlineElements) && allAreInlineHtml(child.children)) {
// cool
} else {
// prolly block
return false;
}
}
return true;
}
/* /*
Copyright: Adam D. Ruppe, 2010 - 2017 Copyright: Adam D. Ruppe, 2010 - 2017
License: <a href="http://www.boost.org/LICENSE_1_0.txt">Boost License 1.0</a>. License: <a href="http://www.boost.org/LICENSE_1_0.txt">Boost License 1.0</a>.