From 76660a3b367f38ed554d32ec20dbe7a1fd39f470 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Fri, 4 Jul 2025 19:21:01 +0900 Subject: refactor(blog/nuldoc): refactor DOM-related code --- services/blog/nuldoc-src/renderers/html.ts | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'services/blog/nuldoc-src/renderers/html.ts') diff --git a/services/blog/nuldoc-src/renderers/html.ts b/services/blog/nuldoc-src/renderers/html.ts index 84b3ebaa..6e829f09 100644 --- a/services/blog/nuldoc-src/renderers/html.ts +++ b/services/blog/nuldoc-src/renderers/html.ts @@ -127,7 +127,7 @@ function getDtd(name: string): Dtd { } function isInlineNode(n: Node): boolean { - if (n.kind === "text") { + if (n.kind === "text" || n.kind === "raw") { return true; } if (n.name !== "a") { @@ -146,11 +146,9 @@ function isBlockNode(n: Node): boolean { function nodeToHtmlText(n: Node, ctx: Context): string { if (n.kind === "text") { - if (n.raw) { - return n.content; - } else { - return textNodeToHtmlText(n, ctx); - } + return textNodeToHtmlText(n, ctx); + } else if (n.kind === "raw") { + return n.html; } else { return elementNodeToHtmlText(n, ctx); } @@ -259,8 +257,8 @@ function indent(ctx: Context): string { } function getElementAttributes(e: Element): [string, string][] { - return [...e.attributes.entries()] - .filter((a) => !a[0].startsWith("--")) + return [...Object.entries(e.attributes)] + .filter((a) => !a[0].startsWith("__")) .filter((a) => a[1] !== undefined) .sort( (a, b) => { -- cgit v1.2.3-70-g09d2