From 0b74eab10d9c3df12d38b5df178be63d054e015e Mon Sep 17 00:00:00 2001 From: Northword Date: Sat, 1 Jul 2023 16:57:33 +0800 Subject: [PATCH 1/3] Remove Zotero 6 compatibility code --- addon/bootstrap.js | 42 +++++++----------------------------------- scripts/build.mjs | 4 ---- 2 files changed, 7 insertions(+), 39 deletions(-) diff --git a/addon/bootstrap.js b/addon/bootstrap.js index 752b416..473c446 100644 --- a/addon/bootstrap.js +++ b/addon/bootstrap.js @@ -71,17 +71,13 @@ async function startup({ id, version, resourceURI, rootURI }, reason) { rootURI = resourceURI.spec; } - if (Zotero.platformMajorVersion >= 102) { - var aomStartup = Components.classes[ - "@mozilla.org/addons/addon-manager-startup;1" - ].getService(Components.interfaces.amIAddonManagerStartup); - var manifestURI = Services.io.newURI(rootURI + "manifest.json"); - chromeHandle = aomStartup.registerChrome(manifestURI, [ - ["content", "__addonRef__", rootURI + "chrome/content/"], - ]); - } else { - setDefaultPrefs(rootURI); - } + var aomStartup = Components.classes[ + "@mozilla.org/addons/addon-manager-startup;1" + ].getService(Components.interfaces.amIAddonManagerStartup); + var manifestURI = Services.io.newURI(rootURI + "manifest.json"); + chromeHandle = aomStartup.registerChrome(manifestURI, [ + ["content", "__addonRef__", rootURI + "chrome/content/"], + ]); /** * Global variables for plugin code. @@ -124,27 +120,3 @@ function shutdown({ id, version, resourceURI, rootURI }, reason) { } function uninstall(data, reason) {} - -// Loads default preferences from defaults/preferences/prefs.js in Zotero 6 -function setDefaultPrefs(rootURI) { - var branch = Services.prefs.getDefaultBranch(""); - var obj = { - pref(pref, value) { - switch (typeof value) { - case "boolean": - branch.setBoolPref(pref, value); - break; - case "string": - branch.setStringPref(pref, value); - break; - case "number": - branch.setIntPref(pref, value); - break; - default: - Zotero.logError(`Invalid type '${typeof value}' for pref '${pref}'`); - } - }, - }; - Zotero.getMainWindow().console.log(rootURI + "prefs.js"); - Services.scriptloader.loadSubScript(rootURI + "prefs.js", obj); -} diff --git a/scripts/build.mjs b/scripts/build.mjs index 7e5079a..aefa996 100644 --- a/scripts/build.mjs +++ b/scripts/build.mjs @@ -131,13 +131,9 @@ async function main() { const optionsAddon = { files: [ - join(buildDir, "**/*.rdf"), - join(buildDir, "**/*.dtd"), - join(buildDir, "**/*.xul"), join(buildDir, "**/*.xhtml"), join(buildDir, "**/*.json"), join(buildDir, "addon/prefs.js"), - join(buildDir, "addon/chrome.manifest"), join(buildDir, "addon/manifest.json"), join(buildDir, "addon/bootstrap.js"), "update.json", From 6f6d3e463a091ffcb6efcfc724aedfe1e166eb9a Mon Sep 17 00:00:00 2001 From: Northword Date: Sat, 1 Jul 2023 16:58:06 +0800 Subject: [PATCH 2/3] Add homepage_url into manifest --- addon/manifest.json | 1 + 1 file changed, 1 insertion(+) diff --git a/addon/manifest.json b/addon/manifest.json index 029bf11..a92439a 100644 --- a/addon/manifest.json +++ b/addon/manifest.json @@ -3,6 +3,7 @@ "name": "__addonName__", "version": "__buildVersion__", "description": "__description__", + "homepage_url": "__homepage__", "author": "__author__", "icons": { "48": "chrome/content/icons/favicon@0.5x.png", From 88c2f9e686ad527e3d6ce9a7db25d3636024fa22 Mon Sep 17 00:00:00 2001 From: Northword Date: Sat, 1 Jul 2023 17:02:24 +0800 Subject: [PATCH 3/3] Add fluent syntax highlighting plugin for vs code --- .vscode/extensions.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 1d7ac85..7ecea32 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -1,3 +1,7 @@ { - "recommendations": ["dbaeumer.vscode-eslint", "esbenp.prettier-vscode"] + "recommendations": [ + "dbaeumer.vscode-eslint", + "esbenp.prettier-vscode", + "macabeus.vscode-fluent" + ] }