fix: Zotero 7.0.0-beta.70 (#766)

fix: #705
windingwind · Apr 9, 2024 · dab10d3 · dab10d3
2 parents 8729987 + 551dcbe
commit dab10d3
Show file tree

Hide file tree

Showing 11 changed files with 504 additions and 498 deletions.
diff --git a/addon/chrome/content/icons/section-16.svg b/addon/chrome/content/icons/section-16.svg
diff --git a/addon/chrome/content/icons/section-20.svg b/addon/chrome/content/icons/section-20.svg
diff --git a/addon/chrome/content/icons/swap.svg b/addon/chrome/content/icons/swap.svg
diff --git a/addon/locale/en-US/mainWindow.ftl b/addon/locale/en-US/mainWindow.ftl
@@ -0,0 +1,4 @@
+itemPaneSection-header =
+    .label = Translate
+itemPaneSection-sidenav =
+    .tooltiptext = Translate
diff --git a/addon/locale/it-IT/mainWindow.ftl b/addon/locale/it-IT/mainWindow.ftl
@@ -0,0 +1,4 @@
+itemPaneSection-header =
+    .label = Translate
+itemPaneSection-sidenav =
+    .tooltiptext = Translate
diff --git a/addon/locale/zh-CN/mainWindow.ftl b/addon/locale/zh-CN/mainWindow.ftl
@@ -0,0 +1,4 @@
+itemPaneSection-header =
+    .label = 翻译
+itemPaneSection-sidenav =
+    .tooltiptext = 翻译
diff --git a/addon/manifest.json b/addon/manifest.json
@@ -13,7 +13,7 @@
     "zotero": {
       "id": "__addonID__",
       "update_url": "__updateURL__",
-      "strict_min_version": "6.999",
+      "strict_min_version": "7.0.0-beta.70",
       "strict_max_version": "7.0.*"
     }
   }

diff --git a/src/addon.ts b/src/addon.ts
@@ -18,7 +18,7 @@ class Addon {
     };
     panel: {
       tabOptionId: string;
-      activePanels: HTMLElement[];
+      activePanels: Record<string, (options: any) => void>;
       windowPanel: Window | null;
     };
     popup: {
@@ -47,7 +47,7 @@ class Addon {
       ztoolkit: createZToolkit(),
       locale: {},
       prefs: { window: null },
-      panel: { tabOptionId: "", activePanels: [], windowPanel: null },
+      panel: { tabOptionId: "", activePanels: {}, windowPanel: null },
       popup: { currentPopup: null },
       translate: {
         selectedText: "",

diff --git a/src/hooks.ts b/src/hooks.ts
@@ -73,6 +73,11 @@ async function onMainWindowLoad(win: Window): Promise<void> {
   ]);
   // Create ztoolkit for every window
   addon.data.ztoolkit = createZToolkit();
+
+  (win as any).MozXULElement.insertFTLIfNeeded(
+    `${config.addonRef}-mainWindow.ftl`,
+  );
+
   registerReaderTabPanel();
   registerPrefsWindow();
   registerMenu();
@@ -87,6 +92,10 @@ async function onMainWindowLoad(win: Window): Promise<void> {
 
 async function onMainWindowUnload(win: Window): Promise<void> {
   ztoolkit.unregisterAll();
+
+  win.document
+    .querySelector(`[href="${config.addonRef}-mainWindow.ftl"]`)
+    ?.remove();
 }
 
 function onShutdown(): void {

diff --git a/src/modules/popup.ts b/src/modules/popup.ts
@@ -63,14 +63,22 @@ export function updateReaderPopup() {
       audiobox,
     );
   }
-  translateButton.hidden = task.status !== "waiting";
+  if (task.status !== "waiting") {
+    translateButton.style.display = "none";
+  } else {
+    translateButton.style.removeProperty("display");
+  }
   textarea.hidden = hidePopupTextarea || task.status === "waiting";
   textarea.value = task.result || task.raw;
   textarea.style.fontSize = `${getPref("fontSize")}px`;
   textarea.style.lineHeight = `${
     Number(getPref("lineHeight")) * Number(getPref("fontSize"))
   }px`;
-  addToNoteButton.hidden = !ZoteroContextPane.getActiveEditor();
+  if (!ZoteroContextPane.activeEditor) {
+    addToNoteButton.style.display = "none";
+  } else {
+    addToNoteButton.style.removeProperty("display");
+  }
   updatePopupSize(popup, textarea);
 }
 
@@ -113,9 +121,14 @@ export function buildReaderPopup(
           ignoreIfExists: true,
         },
         {
-          tag: "div",
+          tag: "button",
+          namespace: "html",
           id: makeId("translate"),
-          classList: ["wide-button", `${config.addonRef}-readerpopup`],
+          classList: [
+            "toolbar-button",
+            "wide-button",
+            `${config.addonRef}-readerpopup`,
+          ],
           properties: {
             innerHTML: `${SVGIcon}${getString("readerpopup-translate-label")}`,
             hidden: getPref("enableAuto"),
@@ -217,9 +230,17 @@ export function buildReaderPopup(
           ],
         },
         {
-          tag: "div",
+          tag: "button",
+          namespace: "html",
           id: makeId("addtonote"),
-          classList: ["wide-button", `${config.addonRef}-readerpopup`],
+          classList: [
+            "toolbar-button",
+            "wide-button",
+            `${config.addonRef}-readerpopup`,
+          ],
+          styles: {
+            marginTop: "8px",
+          },
           properties: {
             innerHTML: `${SVGIcon}${Zotero.getString("pdfReader.addToNote")}`,
           },
@@ -229,7 +250,7 @@ export function buildReaderPopup(
               type: "click",
               listener: async (ev) => {
                 const noteEditor =
-                  ZoteroContextPane && ZoteroContextPane.getActiveEditor();
+                  ZoteroContextPane && ZoteroContextPane.activeEditor;
                 if (!noteEditor) {
                   return;
                 }