fix: zotero 7.0.0-beta.55 or higher

windingwind · Feb 7, 2024 · 48bceab · 48bceab
1 parent 4d7c072
commit 48bceab
Show file tree

Hide file tree

Showing 8 changed files with 88 additions and 79 deletions.
diff --git a/.vscode/toolkit.code-snippets b/.vscode/toolkit.code-snippets
@@ -18,13 +18,13 @@
       "\tremoveIfExists: ${13:true},",
       "\tcustomCheck: (doc: Document, options: ElementOptions) => ${14:true},",
       "\tchildren: [$15]",
-      "}, ${16:container});"
-    ]
+      "}, ${16:container});",
+    ],
   },
   "appendElement - minimum": {
     "scope": "javascript,typescript",
     "prefix": "appendElement",
-    "body": "appendElement({ tag: '$1' }, $2);"
+    "body": "appendElement({ tag: '$1' }, $2);",
   },
   "register Notifier": {
     "scope": "javascript,typescript",
@@ -39,7 +39,7 @@
       "\t) => {",
       "\t\t$0",
       "\t}",
-      "});"
-    ]
-  }
+      "});",
+    ],
+  },
 }
diff --git a/addon/chrome/content/icons/dropmarker.svg b/addon/chrome/content/icons/dropmarker.svg
diff --git a/addon/chrome/content/icons/icon-20.svg b/addon/chrome/content/icons/icon-20.svg
diff --git a/package.json b/package.json
@@ -33,25 +33,25 @@
   "homepage": "https://github.com/windingwind/zotero-actions-tags#readme",
   "dependencies": {
     "js-yaml": "^4.1.0",
-    "zotero-plugin-toolkit": "^2.3.19"
+    "zotero-plugin-toolkit": "^2.3.20"
   },
   "devDependencies": {
     "@types/js-yaml": "^4.0.9",
-    "@types/node": "^20.10.6",
-    "@typescript-eslint/eslint-plugin": "^6.17.0",
-    "@typescript-eslint/parser": "^6.17.0",
+    "@types/node": "^20.11.16",
+    "@typescript-eslint/eslint-plugin": "^6.21.0",
+    "@typescript-eslint/parser": "^6.21.0",
     "chokidar-cli": "^3.0.0",
     "compressing": "^1.10.0",
     "concurrently": "^8.2.2",
     "cross-env": "^7.0.3",
-    "esbuild": "^0.19.11",
+    "esbuild": "^0.19.12",
     "eslint": "^8.56.0",
     "eslint-config-prettier": "^9.1.0",
-    "prettier": "^3.1.1",
+    "prettier": "^3.2.5",
     "release-it": "^16.3.0",
     "replace-in-file": "^7.1.0",
     "typescript": "^5.3.3",
-    "zotero-types": "^1.3.13"
+    "zotero-types": "^1.3.18"
   },
   "eslintConfig": {
     "env": {

diff --git a/scripts/update-template.json b/scripts/update-template.json
@@ -7,7 +7,7 @@
           "update_link": "__updateLink__",
           "applications": {
             "zotero": {
-              "strict_min_version": "6.999"
+              "strict_min_version": "7.0.0-beta.55"
             }
           }
         }

diff --git a/src/modules/menu.ts b/src/modules/menu.ts
@@ -4,6 +4,7 @@ import { getString } from "../utils/locale";
 import { getPref } from "../utils/prefs";
 import { ActionData, ActionShowInMenu } from "../utils/actions";
 import { getCurrentItems, getItemsByKey } from "../utils/items";
+import { getIcon } from "../utils/icon";
 
 export {
   initItemMenu,
@@ -75,7 +76,10 @@ function initItemMenu(win: Window) {
   );
 }
 
-function initReaderMenu() {
+async function initReaderMenu() {
+  // Cache icons
+  await getIcon(`chrome://${config.addonRef}/content/icons/icon-20.svg`);
+  await getIcon(`chrome://${config.addonRef}/content/icons/dropmarker.svg`);
   Zotero.Reader.registerEventListener(
     "renderToolbar",
     readerToolbarCallback,
@@ -136,72 +140,40 @@ function readerToolbarCallback(
   event: Parameters<_ZoteroTypes.Reader.EventHandler<"renderToolbar">>[0],
 ) {
   const { append, doc } = event;
-  const image =
-    "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAACXBIWXMAAAsSAAALEgHS3X78AAAA40lEQVRYCWP8//8/AyFwJL/hjsbXJ8oEFSKBG9wyd20mNqgQUsdESMGCypkppFoOAiA924s711PsAOmfb2NItRwGWP7/FaTYAbQGow4YdcCoA0YdMOqAUQcMuANYCCm4yS394AWboD05hn9k5XrgSqkDjgloPiDHcih4kENAwWgaGHXAqAModcBFKB4QB4AsdoBish1BrgPAli8rNvsAwpQ4ghwHLIRZDhNAcsRCUg0jWBSjW76s2CwBmwTUEQlRvadA3HhiDSQlBHBajuYQkBqiQ4JYBxQSYzmaIwoJKmRgYAAAgCNBYXH3oBUAAAAASUVORK5CYII=";
-  const readerButtonCSS = `
-.actions-tags-reader-menu::before {
-  background-image: url(${image});
-  background-size: 100%;
-  content: "";
-  display: inline-block;
-  height: 16px;
-  vertical-align: top;
-  width: 16px;
-}
-.actions-tags-reader-menu .dropmarker {
-  background: url(assets/icons/searchbar-dropmarker@2x.4ebeb64c.png) no-repeat 0 0/100%;
-  display: inline-block;
-  height: 4px;
-  margin: 6px 0;
-  margin-inline-start: 2px;
-  position: relative;
-  vertical-align: top;
-  width: 7px;
-  z-index: 1;
-}
-`;
-  append(
-    ztoolkit.UI.createElement(doc, "button", {
-      namespace: "html",
-      classList: ["toolbarButton", "actions-tags-reader-menu"],
-      properties: {
-        tabIndex: -1,
-        title: "Actions",
-      },
-      listeners: [
-        {
-          type: "click",
-          listener: (ev: Event) => {
-            document
-              .querySelector(`#${config.addonRef}-reader-popup`)
-              // @ts-ignore XUL.MenuPopup
-              ?.openPopup(
-                doc.querySelector(".actions-tags-reader-menu"),
-                "after_start",
-              );
-          },
-        },
-      ],
-      children: [
-        {
-          tag: "span",
-          classList: ["button-background"],
-        },
-        {
-          tag: "span",
-          classList: ["dropmarker"],
+  const button = ztoolkit.UI.createElement(doc, "button", {
+    namespace: "html",
+    classList: [
+      "toolbar-button",
+      "toolbar-dropdown-button",
+      `${config.addonRef}-reader-button`,
+    ],
+    properties: {
+      tabIndex: -1,
+      title: "Actions",
+    },
+    listeners: [
+      {
+        type: "click",
+        listener: (ev: Event) => {
+          document
+            .querySelector(`#${config.addonRef}-reader-popup`)
+            // @ts-ignore XUL.MenuPopup
+            ?.openPopup(
+              doc.querySelector(`.${config.addonRef}-reader-button`),
+              "after_start",
+            );
         },
-      ],
-    }),
-  );
-  append(
-    ztoolkit.UI.createElement(doc, "style", {
-      id: `${config.addonRef}-reader-button`,
-      properties: {
-        textContent: readerButtonCSS,
       },
-    }),
+    ],
+  });
+  const buttonIcon = getIcon(
+    `chrome://${config.addonRef}/content/icons/icon-20.svg`,
+  );
+  const dropmarkerIcon = getIcon(
+    `chrome://${config.addonRef}/content/icons/dropmarker.svg`,
   );
+  button.innerHTML = `${buttonIcon}${dropmarkerIcon}`;
+  append(button);
 }
 
 function buildItemMenu(

diff --git a/src/utils/icon.ts b/src/utils/icon.ts
@@ -0,0 +1,10 @@
+const icons: Record<string, string> = {};
+
+export function getIcon(src: string) {
+  if (icons[src]) return icons[src];
+  const res = Zotero.HTTP.request("GET", src, {});
+  res.then((r) => {
+    icons[src] = r.response;
+  });
+  return res;
+}
diff --git a/update-beta.json b/update-beta.json
@@ -7,7 +7,7 @@
           "update_link": "https://github.com/windingwind/zotero-actions-tags/releases/download/v1.0.0-beta.33/zotero-actions-tags.xpi",
           "applications": {
             "zotero": {
-              "strict_min_version": "6.999"
+              "strict_min_version": "7.0.0-beta.55"
             }
           }
         }