edtechhub · bjohas · Aug 27, 2019 · Aug 27, 2019 · Aug 27, 2019 · Aug 27, 2019
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -225,7 +225,7 @@
         "prefer-arrow-callback": "off",
         "prefer-const": "off",
         "prefer-destructuring": "off",
-        "prefer-named-capture-group": "error",
+        "prefer-named-capture-group": "off",
         "prefer-numeric-literals": "error",
         "prefer-object-spread": "error",
         "prefer-promise-reject-errors": "error",

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,90 @@
-* In version 3.2.0b:
+* In version 4.0.1:
 
+    + Fixes for Zotero 7.1
+
+* In version 4.0.0:
+
+    + Fixes for Zotero 7.0
+    + New copy item IDs function
+
+* In version 3.10.0:
+
+    + Fixes for Zotero 5.0.97-beta and upcoming Zotero 6
+
+* In version 3.9.0:
+
+    + Fix Open Style Editor shortcut
+    + Add Open Run JavaScript window shortcut
+    + Add mdnotes shortcuts
+    + Update French translations
+
+* In version 3.8.1:
+
+    + Update French translations
+    + Fix ZotFile Quick Extract shortcut
+    + Fix show file shortcut
+
+* In version 3.8.0:
+
+    + Add find available PDFs shortcut
+
+* In version 3.7.0:
+
+    + Add ZotFile Quick Extract shortcut
+
+* In version 3.6.1:
+
+    + Update French locale
+
+* In version 3.6.0:
+
+    + Add "Paste item type" function for batch item type changes
+    + Update French locale
+    + Documentation updates
+
+* In version 3.5.0:
+
+    + Add "Open Zotero URI" function
+    + Allow arbitrary number of alt quick copy functions
+    + Fix "Retrieve metadata for PDF" shortcut
+    + Update French locale
+
+* In version 3.4.0:
+
+    + Added shortcut for pushing reference to TeXstudio with Better BibTeX
+    + Add "Advanced search" shortcut
+    + Add "Locate item" shortcut
+    + Add "Show Locate menu" shortcut
+    + Add tag selector shortcuts:
+        - Toggle displaying automatic tags
+        - Toggle displaying all tags
+        - Deselect all tags
+        - Focus search box
+
+* In version 3.3.3:
+
+    + Filter attachments by mode before trying to modify paths
+
+* In version 3.3.2:
+
+    + Fix mishandling of attachments with paths that did not match the old path pattern in the modify attachments function.
+
+* In version 3.3.1:
+
+    + Fix add tag shortcut for Zotero 5.0.78
+
+* In version 3.3.0:
+
+    + Added shortcut for ZotFile's move and rename attachment
+
+* In version 3.2.1:
+
+    + Compatibility updates for Zotero 5.0.75
+
+* In version 3.2.0:
+
+    + Drop support for Zotero as a Firefox addon and for Zotero 4.x
+    + Update item select link to newer format used by recent version of Zotero
     + Add functions to copy select links and web links to collections
     + Add copy/paste item field functions
 

diff --git a/Makefile b/Makefile
@@ -3,12 +3,11 @@ BLDDIR = build
 LOCALES := $(shell ls i18n)
 
 INTERNAL_READMES := $(patsubst %, addon/chrome/locale/%/zutilo/README.html, $(LOCALES))
-AMO_READMES := $(patsubst %, $(BLDDIR)/amo_readme/%/README.html, $(LOCALES))
 
 # Necessary because zip copies leading directories if run from above targets
 ABS_BLDDIR := $(shell realpath $(BLDDIR))
 
-all: xpi amo_readme
+all: xpi
 
 0x0: $(BLDDIR)/zutilo.xpi
 	curl -F'file=@$(BLDDIR)/zutilo.xpi' https://0x0.st
@@ -26,25 +25,10 @@ addon/chrome/locale/%/zutilo/README.html:
 		$(BLDDIR)/internal_readme/$*/README.md > \
 		addon/chrome/locale/$*/zutilo/README.html
 
-amo_readme: $(AMO_READMES)
-
-$(BLDDIR)/amo_readme/%/README.html:
-	@mkdir -p $(dir $@)
-	scripts/substitute_relative_links \
-		--link-root https://www.github.com/willsALMANJ/Zutilo/blob/master/i18n/$*/readme \
-		i18n/$*/readme/README.md \
-		$(BLDDIR)/amo_readme/$*/README.md
-	pandoc -f markdown_strict -t html \
-		$(BLDDIR)/amo_readme/$*/README.md > \
-		$(BLDDIR)/amo_readme/$*/README.html
-	# Strip tags not allowed on addons.mozilla.org
-	sed -e 's/<p>//' -e 's#</p>#\n#' -e 's/h[1-9]>/strong>/g' -e 's#br />#\n#' \
-		-i $(BLDDIR)/amo_readme/$*/README.html
-
 clean:
 	rm -f $(BLDDIR)/zutilo.xpi
 	rm -f $(INTERNAL_READMES)
 	rm -f $(AMO_READMES)
 	rm -rf $(BLDDIR)/internal_readme/*
 
-.PHONY: all clean xpi amo_readme
+.PHONY: all clean xpi
diff --git a/README.md b/README.md
@@ -1,31 +1,39 @@
 # Zutilo
-Zutilo is a plugin for [Zotero](http://www.zotero.org/) (both the Firefox addon and the standalone client).
+Zutilo is a plugin for [Zotero](http://www.zotero.org/).
 Zutilo adds several functions not available in base Zotero through extra menu items and keyboard shortcuts.
 Here are some of Zutilo's features:
 
 * Copy, paste, and remove sets of tags
 * Select and right-click to relate several items
 * Copy items to the clipboard in several formats
 * Keyboard shortcuts for editing items and focusing and hiding different elements of the Zotero user interface
-* Right-click to save link or document as an attachment to currently selected item (only for Zotero as a Firefox addon)
 
 Zutilo strives to enable whatever Zotero workflow is desired and otherwise to get out of the way.
 All of Zutilo's graphical elements can be disabled individually, so that unwanted features do not clutter the user interface.
 
-**NOTE:** As of version 3.0, Zutilo is distributed from the [GitHub releases page](https://github.com/willsALMANJ/Zutilo/releases).
-New updates will not be published to the location checked by previous versions of Zutilo (the Mozilla Add-ons page).
-To receive new Zutilo updates, please update to the latest version of Zutilo.
+> [!NOTE]
+> Zutilo is largely maintained by one person (@wshanks) who does not have much time for Zutilo any more.
+> @wshanks still uses Zotero but not as heavily and so has less need for the power user features of Zutilo.
+> Additional help adapting to new releases of Zotero and fixing other bugs is very welcome.
+> Without additional contributors, Zutilo may not be able to keep compatibility with future releases of Zotero.
+> As of Zotero version 7.0, some features of Zutilo, mainly keyboard shortcuts, no longer function.
+> There was also a long gap between the release of Zotero 7 and a release of Zutilo that could be installed with it.
 
 ## Installation
 
-Download the Zutilo `zutilo.xpi` file from [Zutilo's GitHub releases page](https://github.com/willsALMANJ/Zutilo/releases).
+Download the Zutilo `zutilo.xpi` file from [Zutilo's GitHub releases page](https://github.com/wshanks/Zutilo/releases).
 Then go to Tools->Add-ons in Zotero Standalone.
 Click on the gear button in the upper right area of the Add-ons Manager window that appears and choose "Install Add-on From File."
 Then select the downloaded `zutilo.xpi` file.
 
+**NOTE for Firefox users:** Firefox treats `.xpi` files as Firefox add-ons and tries to install them.
+Rather than clicking on the `.xpi` file, you can try right-clicking and choosing to save the link as a file.
+In some cases (particularly on Linux), Firefox does not allow right-clicking and saving the `.xpi` link either.
+In that case, you must download it either with a different browser or with a command-line tool like `curl` or `wget`.
+
 ## Getting started
 
-Zutilo can be customized via its preferences window, which can reached either via the Firefox Addons Manager or the Zotero action menu (the gear icon).
+Zutilo can be customized via its preferences window, which can reached via the Zotero Addons Manager or the Tools menu.
 
 ### Zotero item menu
 
@@ -40,18 +48,7 @@ All of the functions that can appear in the item menu can also be called by keyb
 Zutilo also provides some additional keyboard shortcut functions that are not available from the item menu.
 By default, no keyboard shortcuts are defined.
 A shortcut key combination can be set for each function in Zutilo's preferences.
-If the key combination is already assigned for another Firefox function, a warning will be displayed.
-
-### Firefox specific functions
-
-Zutilo adds entries to the Zotero address bar icon's menu for saving items into Zotero with the opposite attachment behavior from that set in Zotero's preferences.
-So if you have Zotero set to download attachments when saving an item, Zutilo will add an entry to save the item without attachments.
-The extra menu items can be disabled in Zutilo's preferences.
-
-Zutilo adds two entries to right-click menu in Firefox, one to save the current page as an attachment (most useful when the page is a pdf) and another to save a link as an attachment (if a link was right-clicked).
-These menu items appear the Zotero submenu of the Firefox right-click menu.
-In Zutilo's preferences, the menu items can be set to appear in the right-click menu directly (instead of the Zotero submenu) or can be disabled.
-Whether the attachment files are imported to Zotero or downloaded and linked to Zotero items can be also be set in Zutilo's preferences.
+If the key combination is already assigned for another function, a warning will be displayed.
 
 ## Usage notes
 

diff --git a/addon/bootstrap.js b/addon/bootstrap.js
@@ -5,32 +5,32 @@
 
 "use strict";
 /* global Components, Services */
-/* global Zutilo */
+/* global Zutilo, APP_SHUTDOWN */
 const {classes: Cc, utils: Cu} = Components;
+var chromeHandle
 
 Cu.import("resource://gre/modules/Services.jsm");
 
-const BOOTSTRAP_REASONS = [
-    "", // the bootstrap reason is 1 based
-    "APP_STARTUP",
-    "APP_SHUTDOWN",
-    "ADDON_ENABLE",
-    "ADDON_DISABLE",
-    "ADDON_INSTALL",
-    "ADDON_UNINSTALL",
-    "ADDON_UPGRADE",
-    "ADDON_DOWNGRADE"
-];
-
 // eslint-disable-next-line no-unused-vars
 function install(data, reason) {
 
 }
 
 // eslint-disable-next-line no-unused-vars
 function startup(data, reason) {
-    Cu.import("chrome://zutilo/content/zutilo.jsm");
-    Zutilo.init();
+    let aomStartup = Cc["@mozilla.org/addons/addon-manager-startup;1"].getService(Ci.amIAddonManagerStartup)
+    let manifestURI = Services.io.newURI(data.rootURI + "manifest.json");
+    chromeHandle = aomStartup.registerChrome(manifestURI, [
+        ["content", "zutilo", "chrome/content/zutilo/"],
+        ["locale",  "zutilo", "en-US", "chrome/locale/en-US/zutilo/"],
+        ["locale",  "zutilo", "de", "chrome/locale/de/zutilo/"],
+        ["locale",  "zutilo", "es", "chrome/locale/es/zutilo/"],
+        ["locale",  "zutilo", "fr", "chrome/locale/fr/zutilo/"],
+        ["locale",  "zutilo", "zh-CN", "chrome/locale/zh-CN/zutilo/"]
+    ])
+
+    Cu.import("chrome://zutilo/content/zutilo.js");
+    Zutilo.init(data.rootURI, Zotero);
 }
 
 // eslint-disable-next-line no-unused-vars
@@ -44,9 +44,6 @@ function shutdown(data, reason) {
         var tmpWin=windows.getNext();
 
         tmpWin.ZutiloChrome.removeXUL();
-        if (typeof tmpWin.ZutiloChrome.firefoxOverlay != 'undefined') {
-            tmpWin.ZutiloChrome.firefoxOverlay.unload();
-        }
         if (typeof tmpWin.ZutiloChrome.zoteroOverlay != 'undefined') {
             tmpWin.ZutiloChrome.zoteroOverlay.unload();
         }
@@ -55,11 +52,13 @@ function shutdown(data, reason) {
     }
 
     Zutilo.cleanup();
+    chromeHandle.destruct()
+    chromeHandle = null
 
     Cc["@mozilla.org/intl/stringbundle;1"].
         getService(Components.interfaces.nsIStringBundleService).flushBundles();
 
-    Cu.unload("chrome://zutilo/content/zutilo.jsm");
+    Cu.unload("chrome://zutilo/content/zutilo.js");
 }
 
 // eslint-disable-next-line no-unused-vars