Skip to content

Use html.Parse rather than html.ParseFragment #16223

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 21, 2021
Merged

Use html.Parse rather than html.ParseFragment #16223

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f691ade
Use html.Parse rather than html.ParseFragment
zeripath Jun 21, 2021
e94fa87
skip document node
zeripath Jun 21, 2021
7c3bdd4
Merge branch 'main' into fix-issue-with-parse-fragment
zeripath Jun 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 12 additions & 13 deletions modules/markup/html.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,27 +304,26 @@ func postProcess(ctx *RenderContext, procs []processor, input io.Reader, output
_, _ = res.WriteString("</body></html>")

// parse the HTML
nodes, err := html.ParseFragment(res, nil)
node, err := html.Parse(res)
if err != nil {
return &postProcessError{"invalid HTML", err}
}

for _, node := range nodes {
visitNode(ctx, procs, node, true)
if node.Type == html.DocumentNode {
node = node.FirstChild
}

newNodes := make([]*html.Node, 0, len(nodes))
visitNode(ctx, procs, node, true)

for _, node := range nodes {
if node.Data == "html" {
node = node.FirstChild
for node != nil && node.Data != "body" {
node = node.NextSibling
}
}
if node == nil {
continue
newNodes := make([]*html.Node, 0, 5)

if node.Data == "html" {
node = node.FirstChild
for node != nil && node.Data != "body" {
node = node.NextSibling
}
}
if node != nil {
if node.Data == "body" {
child := node.FirstChild
for child != nil {
Expand Down