From 387f41194b836317ca8b5a01350467df183189ac Mon Sep 17 00:00:00 2001
From: Linxzh <linxzh1989@gmail.com>
Date: Fri, 22 Dec 2023 15:25:21 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=8C=E7=94=A8=E6=88=B7=E7=BB=8F=E5=B8=B8?=
 =?UTF-8?q?=E5=8F=8D=E9=A6=88=E7=9A=84=E8=AE=BE=E7=BD=AE=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=B8=B8=E7=94=A8=E8=AE=BE=E7=BD=AE=E4=B8=8B=E6=8B=89=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 addon/chrome/content/preferences.xhtml | 249 ++++++++++++++++++-------
 src/modules/preferenceScript.ts        | 101 +++++-----
 2 files changed, 226 insertions(+), 124 deletions(-)

diff --git a/addon/chrome/content/preferences.xhtml b/addon/chrome/content/preferences.xhtml
index 5cea462..d22154d 100644
--- a/addon/chrome/content/preferences.xhtml
+++ b/addon/chrome/content/preferences.xhtml
@@ -1,20 +1,43 @@
 <linkset>
   <html:link rel="localization" href="__addonRef__-preferences.ftl" />
-  <html:link xmlns:html="http://www.w3.org/1999/xhtml" rel="stylesheet"
-    href="chrome://__addonRef__/content/prefpanel.css" />
+  <html:link
+    xmlns:html="http://www.w3.org/1999/xhtml"
+    rel="stylesheet"
+    href="chrome://__addonRef__/content/prefpanel.css"
+  />
 </linkset>
-<vbox id="zotero-prefpane-__addonRef__" onload="Zotero.__addonInstance__.hooks.onPrefsEvent('load', {window})">
+<vbox
+  id="zotero-prefpane-__addonRef__"
+  onload="Zotero.__addonInstance__.hooks.onPrefsEvent('load', {window})"
+>
   <groupbox>
     <label>
       <html:h2 data-l10n-id="chinese-caption"></html:h2>
     </label>
-    <checkbox id="zotero-prefpane-jasminum.autoupdate" preference="__prefsPrefix__.autoupdate"
-      data-l10n-id="autoupdate-label" native="true" />
-    <checkbox id="jasminum.zhnamesplit" data-l10n-id="zhnamesplit-label" preference="__prefsPrefix__.zhnamesplit"
-      native="true" />
-    <checkbox id="jasminum.rename" data-l10n-id="rename-label" preference="__prefsPrefix__.rename" native="true" />
-    <checkbox id="jasminum.autobookmark" data-l10n-id="autobookmark-label" preference="__prefsPrefix__.autobookmark"
-      native="true" />
+    <checkbox
+      id="zotero-prefpane-jasminum.autoupdate"
+      preference="__prefsPrefix__.autoupdate"
+      data-l10n-id="autoupdate-label"
+      native="true"
+    />
+    <checkbox
+      id="jasminum.zhnamesplit"
+      data-l10n-id="zhnamesplit-label"
+      preference="__prefsPrefix__.zhnamesplit"
+      native="true"
+    />
+    <checkbox
+      id="jasminum.rename"
+      data-l10n-id="rename-label"
+      preference="__prefsPrefix__.rename"
+      native="true"
+    />
+    <checkbox
+      id="jasminum.autobookmark"
+      data-l10n-id="autobookmark-label"
+      preference="__prefsPrefix__.autobookmark"
+      native="true"
+    />
     <!-- <hbox>
       <checkbox id="jasminum.autolanguage" data-l10n-id="autolanguage-label"
         preference="__prefsPrefix__.autolanguage" native="true" />
@@ -42,11 +65,18 @@
             <menuitem data-l10n-id="namepatent-custom" />
           </menupopup>
         </menulist>
-        <html:input type="text" class="auto_width" id="jasminum-namepatent-input"
-          preference="__prefsPrefix__.namepatent">
+        <html:input
+          type="text"
+          class="auto_width"
+          id="jasminum-namepatent-input"
+          preference="__prefsPrefix__.namepatent"
+        >
         </html:input>
-        <image src="chrome://jasminum/content/icons/information.png" style="margin-top: 5px; margin-bottom: 5px"
-          data-l10n-id="namepatent-desc" />
+        <image
+          src="chrome://jasminum/content/icons/information.png"
+          style="margin-top: 5px; margin-bottom: 5px"
+          data-l10n-id="namepatent-desc"
+        />
       </hbox>
     </vbox>
   </groupbox>
@@ -79,24 +109,52 @@
     </description>
 
     <hbox flex="2" class="inputbox">
-      <menulist id="jasminum-pdftk-path-menulist" flex="0.5" native="true">
+      <menulist id="jasminum-pdftkpath-menulist" native="true">
         <menupopup>
-          <menuitem label="Windows Default" value="C:\Program Files (x86)\PDFtk Server\bin"
-            tooltiptext="C:\Program Files (x86)\PDFtk Server\bin" />
-          <menuitem label="Linux Default" value="/usr/bin" tooltiptext="/usr/bin" />
-          <menuitem label="MacOS Default 1" value="/opt/pdflabs/pdftk" tooltiptext="/opt/pdflabs/pdftk" />
-          <menuitem label="MacOS Default 2" value="/usr/local/bin/pdftk" tooltiptext="/usr/local/bin/pdftk" />
+          <menuitem
+            label="Windows Default"
+            value="C:\Program Files (x86)\PDFtk Server\bin"
+            tooltiptext="C:\Program Files (x86)\PDFtk Server\bin"
+          />
+          <menuitem
+            label="Linux Default"
+            value="/usr/bin"
+            tooltiptext="/usr/bin"
+          />
+          <menuitem
+            label="MacOS Default 1"
+            value="/opt/pdflabs/pdftk"
+            tooltiptext="/opt/pdflabs/pdftk"
+          />
+          <menuitem
+            label="MacOS Default 2"
+            value="/usr/local/bin/pdftk"
+            tooltiptext="/usr/local/bin/pdftk"
+          />
           <menuseparator></menuseparator>
           <menuitem data-l10n-id="namepatent-custom" />
         </menupopup>
       </menulist>
-      <html:input style="flex: 2" type="text" id="jasminum-pdftk-path-input" preference="__prefsPrefix__.pdftkpath">
+      <html:input
+        style="flex: 2"
+        type="text"
+        id="jasminum-pdftkpath-input"
+        preference="__prefsPrefix__.pdftkpath"
+      >
       </html:input>
       <button data-l10n-id="choose" id="choose-button" native="true" />
-      <image id="path-accept" src="chrome://jasminum/content/icons/accept.png" data-l10n-id="pdftk-path-check-ok"
-        hidden="true" />
-      <image id="path-error" src="chrome://jasminum/content/icons/exclamation.png" data-l10n-id="pdftk-path-check-error"
-        hidden="true" />
+      <image
+        id="path-accept"
+        src="chrome://jasminum/content/icons/accept.png"
+        data-l10n-id="pdftk-path-check-ok"
+        hidden="true"
+      />
+      <image
+        id="path-error"
+        src="chrome://jasminum/content/icons/exclamation.png"
+        data-l10n-id="pdftk-path-check-error"
+        hidden="true"
+      />
     </hbox>
   </groupbox>
   <groupbox>
@@ -104,8 +162,12 @@
       <html:h2 data-l10n-id="toolbox-caption"></html:h2>
     </label>
     <vbox flex="1">
-      <checkbox id="jasminum.ennamesplit" data-l10n-id="toolbox-ennamesplit-label"
-        preference="__prefsPrefix__.ennamesplit" native="true" />
+      <checkbox
+        id="jasminum.ennamesplit"
+        data-l10n-id="toolbox-ennamesplit-label"
+        preference="__prefsPrefix__.ennamesplit"
+        native="true"
+      />
       <!-- <hbox>
         <label class="jasminum-label" data-l10n-id="toolbox-bacthsetlanguage-info"></label>
         <html:input type="text" id="jasminum.languagelist" preference="__prefsPrefix__.languagelist">
@@ -113,39 +175,69 @@
         <image src="chrome://jasminum/content/icons/information.png" style="margin-top: 5px; margin-bottom: 5px"
           data-l10n-id="toolbox-bacthsetlanguage-desc" />
       </hbox> -->
-      <hbox>
-        <label class="jasminum-label" data-l10n-id="toolbox-manualsetlanguage-info"></label>
-        <html:div class="editable_div" style="position: relative">
-          <menulist flex="0.5" id="jasminum-language" preference="__prefsPrefix__.language" native="true"
-            style="width: 148px">
-            <menupopup>
-              <menuitem label="zh-CN" value="zh-CN" />
-              <menuitem label="en-US" value="en-US" />
-            </menupopup>
-          </menulist>
-          <html:input type="text" id="jasminum-language-input" preference="__prefsPrefix__.language" style="
-              position: absolute;
-              top: 0px;
-              left: 0px;
-              border: 0px;
-              height: 19.5px;
-            "></html:input>
-        </html:div>
-        <image src="chrome://jasminum/content/icons/information.png" style="margin-top: 5px; margin-bottom: 5px"
-          data-l10n-id="toolbox-manualsetlanguage-desc" />
+      <hbox class="inputbox">
+        <label
+          class="jasminum-label"
+          data-l10n-id="toolbox-manualsetlanguage-info"
+        ></label>
+        <menulist flex="0.5" id="jasminum-language-menulist" native="true">
+          <menupopup>
+            <menuitem label="中文(zh-CN)" value="zh-CN" />
+            <menuitem label="English(en-US)" value="en-US" />
+            <menuspeporator></menuspeporator>
+            <menuitem data-l10n-id="namepatent-custom" />
+          </menupopup>
+        </menulist>
+        <html:input
+          type="text"
+          id="jasminum-language-input"
+          preference="__prefsPrefix__.language"
+        ></html:input>
+        <image
+          src="chrome://jasminum/content/icons/information.png"
+          style="margin-top: 5px; margin-bottom: 5px"
+          data-l10n-id="toolbox-manualsetlanguage-desc"
+        />
       </hbox>
       <hbox>
-        <label class="jasminum-label" data-l10n-id="toolbox-dateformatter-info"></label>
-        <menulist id="jasminum.dateformatter" preference="__prefsPrefix__.dateformatter" native="true">
+        <label
+          class="jasminum-label"
+          data-l10n-id="toolbox-dateformatter-info"
+        ></label>
+        <menulist
+          id="jasminum.dateformatter"
+          preference="__prefsPrefix__.dateformatter"
+          native="true"
+        >
           <menupopup>
-            <menuitem label="ISO" value="ISO" tooltiptext="toolbox.dateformatter.iso;" />
-            <menuitem label="Short" value="short" tooltiptext="toolbox.dateformatter.short;" />
-            <menuitem label="Short Reverse" value="shortReverse" tooltiptext="toolbox.dateformatter.shortreverse;" />
-            <menuitem label="Year Only" value="yearOnly" tooltiptext="toolbox.dateformatter.yearonly;" />
+            <menuitem
+              label="ISO"
+              value="ISO"
+              tooltiptext="toolbox.dateformatter.iso;"
+            />
+            <menuitem
+              label="Short"
+              value="short"
+              tooltiptext="toolbox.dateformatter.short;"
+            />
+            <menuitem
+              label="Short Reverse"
+              value="shortReverse"
+              tooltiptext="toolbox.dateformatter.shortreverse;"
+            />
+            <menuitem
+              label="Year Only"
+              value="yearOnly"
+              tooltiptext="toolbox.dateformatter.yearonly;"
+            />
           </menupopup>
         </menulist>
-        <checkbox id="jasminum.dateformatterfill" data-l10n-id="toolbox-dateformatterfill"
-          preference="__prefsPrefix__.dateformatterfill" native="true" />
+        <checkbox
+          id="jasminum.dateformatterfill"
+          data-l10n-id="toolbox-dateformatterfill"
+          preference="__prefsPrefix__.dateformatterfill"
+          native="true"
+        />
       </hbox>
     </vbox>
   </groupbox>
@@ -156,16 +248,31 @@
     <hbox class="virtualized-table-container" flex="1" height="300">
       <html:div style="height: 350px; overflow-y: scroll">
         <html:div id="jasminum-translator-table-loading">
-          <html:embed src="chrome://jasminum/content/icons/loading.svg" style="width: 50px" />
+          <html:embed
+            src="chrome://jasminum/content/icons/loading.svg"
+            style="width: 50px"
+          />
           <html:p>loading</html:p>
         </html:div>
         <html:table id="jasminum-translator-table">
           <html:thead id="jasminum-translator-table-header">
             <html:tr>
-              <html:th data-l10n-id="translator-tab-column1" id="translator-tab-column1"></html:th>
-              <html:th data-l10n-id="translator-tab-column2" id="translator-tab-column2"></html:th>
-              <html:th data-l10n-id="translator-tab-column3" id="translator-tab-column3"></html:th>
-              <html:th data-l10n-id="translator-tab-column4" id="translator-tab-column4"></html:th>
+              <html:th
+                data-l10n-id="translator-tab-column1"
+                id="translator-tab-column1"
+              ></html:th>
+              <html:th
+                data-l10n-id="translator-tab-column2"
+                id="translator-tab-column2"
+              ></html:th>
+              <html:th
+                data-l10n-id="translator-tab-column3"
+                id="translator-tab-column3"
+              ></html:th>
+              <html:th
+                data-l10n-id="translator-tab-column4"
+                id="translator-tab-column4"
+              ></html:th>
             </html:tr>
           </html:thead>
           <html:tbody id="jasminum-translator-table-tbody">
@@ -175,12 +282,24 @@
       </html:div>
     </hbox>
     <hbox>
-      <button data-l10n-id="updateall-label" id="download-all-translators" native="true" flex="0.5" />
-      <button data-l10n-id="refresh-label" id="refresh-translators" native="true" flex="0.5" />
+      <button
+        data-l10n-id="updateall-label"
+        id="download-all-translators"
+        native="true"
+        flex="0.5"
+      />
+      <button
+        data-l10n-id="refresh-label"
+        id="refresh-translators"
+        native="true"
+        flex="0.5"
+      />
     </hbox>
   </groupbox>
 </vbox>
 <vbox>
-  <html:label data-l10n-id="addon-info"
-    data-l10n-args='{"time": "__buildTime__","name": "__addonName__","version":"__buildVersion__"}'></html:label>
-</vbox>
\ No newline at end of file
+  <html:label
+    data-l10n-id="addon-info"
+    data-l10n-args='{"time": "__buildTime__","name": "__addonName__","version":"__buildVersion__"}'
+  ></html:label>
+</vbox>
diff --git a/src/modules/preferenceScript.ts b/src/modules/preferenceScript.ts
index 22342b9..503da7b 100644
--- a/src/modules/preferenceScript.ts
+++ b/src/modules/preferenceScript.ts
@@ -3,6 +3,17 @@ import { clearPref, getPref, setPref } from "../utils/prefs";
 import { showPop } from "../utils/window";
 import { getString } from "../utils/locale";
 
+const Choices: any = {
+  namepatent: { "{%t}_{%g}": 1, "{%t}": 2 },
+  pdftkpath: {
+    "C:\\Program Files (x86)\\PDFtk Server\\bin": 1,
+    "/usr/bin": 2,
+    "/opt/pdflabs/pdftk": 3,
+    "/usr/local/bin/pdftk": 4,
+  },
+  language: { "zh-CN": 1, "en-US": 2 },
+};
+
 export async function checkPath(pathvalue: string): Promise<void> {
   if (!pathvalue) return;
   let pdftk = "";
@@ -236,71 +247,42 @@ export async function refreshTable() {
   await insertTable(false, true);
 }
 
-function updateNamePatentMenu(e: Event) {
-  const menuValue = (e.target as HTMLInputElement).value;
-  const inputField = addon.data.prefs!.window.document.querySelector(
-    "#jasminum-namepatent-input"
-  ) as HTMLInputElement;
-  if (menuValue) {
-    // 选中候选选项
-    setPref("namepatent", menuValue);
-  } else {
-    // inputField.value = "";
-    inputField.focus();
-  }
-}
-
-function updateNamePatentInput(e: Event) {
-  // const valueChoices = ["{%t}_{%g}", "{%t}"];
-  // const inputValue = (e.target as HTMLInputElement).value;
-  // ztoolkit.log(inputValue);
-  // ztoolkit.log("change");
-  // 可能这里有bug。Mac中事件修改了selectedIndex值，不能马上更新，切换窗口后才能更新菜单项
-  (addon.data.prefs!.window.document.querySelector(
-    "#jasminum-namepatent-menulist"
-  ) as any).selectedIndex = 3;
-}
-
-function updatePDFtkMenu(e: Event) {
+function updateMenu(e: Event, prefName: string) {
   const menuValue = (e.target as HTMLInputElement).value;
   const inputField = addon.data.prefs!.window.document.querySelector(
-    "#jasminum-pdftk-path-input"
+    `#jasminum0${prefName}-input`
   ) as HTMLInputElement;
   if (menuValue) {
     // 选中候选选项
-    setPref("pdftkpath", menuValue);
+    setPref(prefName, menuValue);
   } else {
     inputField.value = "";
     inputField.focus();
   }
 }
 
-function updatePDFtkInput(e: Event) {
-  // const valueChoices = ["{%t}_{%g}", "{%t}"];
-  // const inputValue = (e.target as HTMLInputElement).value;
+function updateMenuListIndex(id: string, value: string) {
+  ztoolkit.log(id);
+  ztoolkit.log(Choices);
   const menulist = addon.data.prefs!.window.document.querySelector(
-    "#jasminum-pdftk-path-menulist"
+    `#jasminum-${id}-menulist`
   ) as any;
-  menulist.selectedIndex = 5;
+  // 注意此处的index计算，Choices 是从1开始，避免0被判断为false
+  const index = (Choices[id][value] || Object.keys(Choices[id]).length + 2) - 1;
+  menulist.selectedIndex = index;
+}
+
+function updateInput(e: Event, id: string) {
+  const inputValue = (e.target as HTMLInputElement).value;
+  updateMenuListIndex(id, inputValue);
 }
 
 // Display the right menu when open pref window
 function checkInputMenu() {
-  const patentChoices: any = { "{%t}_{%g}": 0, "{%t}": 1 };
-  const pdftkChoices: any = {
-    "C:\\Program Files (x86)\\PDFtk Server\\bin": 0,
-    "/usr/bin": 1,
-    "/opt/pdflabs/pdftk": 2,
-    "/usr/local/bin/pdftk": 3
-  };
-  const menulistPatent = addon.data.prefs!.window.document.querySelector(
-    "#jasminum-namepatent-menulist"
-  ) as any;
-  const menulistPDFtk = addon.data.prefs!.window.document.querySelector(
-    "#jasminum-pdftk-path-menulist"
-  ) as any;
-  menulistPatent.selectedIndex = patentChoices[getPref("namepatent") as string] || 3;
-  menulistPDFtk.selectedIndex = pdftkChoices[getPref("pdftkpath") as string] || 5;
+  const prefs = ["namepatent", "pdftkpath", "language"];
+  for (const p of prefs) {
+    updateMenuListIndex(p, getPref(p) as string);
+  }
 }
 
 export async function registerPrefsScripts(_window: Window) {
@@ -336,21 +318,18 @@ function bindPrefEvents() {
   addon.data
     .prefs!.window.document.querySelector("#jasminum-open-cnki")
     ?.addEventListener("click", (e) => {
-      ztoolkit.log(e);
       addon.data.prefs!.window.alert(`open CNKI`);
     });
 
   addon.data
-    .prefs!.window.document.querySelector("#jasminum-pdftk-path-input")
+    .prefs!.window.document.querySelector("#jasminum-pdftkpath-input")
     ?.addEventListener("change", async (e) => {
-      updatePDFtkInput(e);
       await checkPath((e.target as HTMLInputElement).value);
     });
 
   addon.data
-    .prefs!.window.document.querySelector("#jasminum-pdftk-path-menulist")
+    .prefs!.window.document.querySelector("#jasminum-pdftkpath-menulist")
     ?.addEventListener("command", async (e) => {
-      updatePDFtkMenu(e);
       await checkPath((e.target as HTMLInputElement).value);
     });
 
@@ -393,11 +372,15 @@ function bindPrefEvents() {
       }
     });
 
-  addon.data
-    .prefs!.window.document.querySelector("#jasminum-namepatent-menulist")
-    ?.addEventListener("command", updateNamePatentMenu);
+  // 可编辑的下拉及输入选项
+  const special_input = Object.keys(Choices);
+  for (const id of special_input) {
+    addon.data
+      .prefs!.window.document.querySelector(`#jasminum-${id}-input`)
+      ?.addEventListener("input", (e) => updateInput(e, id));
 
-  addon.data
-    .prefs!.window.document.querySelector("#jasminum-namepatent-input")
-    ?.addEventListener("change", updateNamePatentInput);
+    addon.data
+      .prefs!.window.document.querySelector(`#jasminum-${id}-menulist`)
+      ?.addEventListener("command", (e) => updateMenu(e, id));
+  }
 }