fix: missing html encoding in bookmark title

igorlogius · Jun 22, 2024 · 4c7bfa8 · 4c7bfa8
1 parent ad072c6
commit 4c7bfa8
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 14 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -28,6 +28,4 @@ jobs:
           ISSUER: ${{secrets.ISSUER}}
           SECRET: ${{secrets.SECRET}}
         run: curl 'https://raw.githubusercontent.com/igorlogius/meta-addon-builder/main/README' | sh
-
-
 
diff --git a/background.js b/background.js
@@ -1,10 +1,9 @@
 /* global browser */
 
-function htmlEncode(input) {
-  const textArea = document.createElement("textarea");
-  textArea.innerText = input;
-  return textArea.innerHTML.split("<br>").join("\n");
-}
+const toHtmlEntities = (str, showInHtml = false) =>
+  [...str]
+    .map((v) => `${showInHtml ? `&amp;#` : `&#`}${v.codePointAt(0)};`)
+    .join(``);
 
 async function exportJSON(bookmarkId) {
   if (typeof bookmarkId !== "string") {
@@ -18,7 +17,7 @@ async function exportJSON(bookmarkId) {
   dl.setAttribute("href", window.URL.createObjectURL(textFileAsBlob));
   dl.setAttribute(
     "download",
-    "export " + (bookmarkId === "root________" ? "all" : data.title) + ".json"
+    "export " + (bookmarkId === "root________" ? "all" : data.title) + ".json",
   );
   dl.setAttribute("visibility", "hidden");
   dl.setAttribute("display", "none");
@@ -33,8 +32,8 @@ function rec2HtmlStr(bmTreeNode, level = 1) {
   let out = "";
   "\t".repeat(level);
   let tmp = "";
-  const title =
-    typeof bmTreeNode.title === "string" ? htmlEncode(bmTreeNode.title) : "";
+  let title = typeof bmTreeNode.title === "string" ? bmTreeNode.title : "";
+  title = toHtmlEntities(title);
   if (typeof bmTreeNode.url === "string") {
     out =
       out +
@@ -46,7 +45,7 @@ function rec2HtmlStr(bmTreeNode, level = 1) {
       "</A>" +
       "\n";
   } else if (Array.isArray(bmTreeNode.children)) {
-    tmp = "\t".repeat(level) + "<DT><H3>" + htmlEncode(title) + "</H3>" + "\n";
+    tmp = "\t".repeat(level) + "<DT><H3>" + title + "</H3>" + "\n";
     if (bmTreeNode.children.length > 0) {
       out = out + tmp;
       out = out + "\t".repeat(level) + "<DL><p>" + "\n";
@@ -98,7 +97,7 @@ async function exportHTML(bookmarkId) {
   dl.setAttribute("href", window.URL.createObjectURL(textFileAsBlob));
   dl.setAttribute(
     "download",
-    "export " + (bookmarkId === "root________" ? "all" : data.title) + ".html"
+    "export " + (bookmarkId === "root________" ? "all" : data.title) + ".html",
   );
   dl.setAttribute("visibility", "hidden");
   dl.setAttribute("display", "none");

diff --git a/manifest.json b/manifest.json
@@ -11,5 +11,5 @@
   "description": "Import or export a branch of the bookmark tree as a JSON or HTML file",
   "name": "Bookmark Branch Porter",
   "permissions": ["menus", "bookmarks"],
-  "version": "1.4.16"
+  "version": "1.4.17"
 }
diff --git a/options.html b/options.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <head>
   <meta content="text/html;charset=utf-8" />
   <style>