Update to Zotero 5.0.61

pedrom34 · Mar 11, 2019 · 7b3a6bd · 7b3a6bd
1 parent 518bfd8
commit 7b3a6bd
Show file tree

Hide file tree

Showing 15 changed files with 29 additions and 11 deletions.
diff --git a/App/Zotero/application.ini b/App/Zotero/application.ini
@@ -1,8 +1,8 @@
 [App]
 Vendor=Zotero
 Name=Zotero
-Version=5.0.60
-BuildID=20190110060102
+Version=5.0.61
+BuildID=20190309215725
 Copyright=Copyright (c) 2006-2018 Contributors
 ID[email protected]
 

diff --git a/App/Zotero/components/zotero-protocol-handler.js b/App/Zotero/components/zotero-protocol-handler.js
@@ -849,6 +849,12 @@ function ZoteroProtocolHandler() {
 			router.run(path);
 
 			Zotero.API.parseParams(params);
+
+			if (!params.objectKey && !params.objectID && !params.itemKey) {
+				Zotero.debug("No objects specified");
+				return;
+			}
+
 			var results = yield Zotero.API.getResultsFromParams(params);
 
 			if (!results.length) {
@@ -868,8 +874,7 @@ function ZoteroProtocolHandler() {
 				return zp.collectionsView.selectCollection(results[0].id);
 			} else
 			{
-				// TODO: Currently only able to select one item
-				return zp.selectItem(results[0].id);
+				return zp.selectItems(results.map(x => x.id));
 			}
 		}),
 

diff --git a/App/Zotero/components/zotero-service.js b/App/Zotero/components/zotero-service.js
@@ -152,7 +152,13 @@ var isFirstLoadThisSession = true;
 var zContext = null;
 var initCallbacks = [];
 var zInitOptions = {};
-Components.utils.import('resource://zotero/require.js');
+
+// Components.utils.import('resource://zotero/require.js');
+// Not using Cu.import here since we don't want the require module to be cached
+// for includes within ZoteroPane or other code, where we want the window instance available to modules.
+Components.classes["@mozilla.org/moz/jssubscript-loader;1"].
+getService(Components.interfaces.mozIJSSubScriptLoader).
+loadSubScript('resource://zotero/require.js');
 
 ZoteroContext = function () {};
 ZoteroContext.prototype = {

diff --git a/App/Zotero/defaults/preferences/zotero.js b/App/Zotero/defaults/preferences/zotero.js
@@ -35,6 +35,7 @@ pref("extensions.zotero.layout", "standard");
 pref("extensions.zotero.recursiveCollections", false);
 pref("extensions.zotero.autoRecognizeFiles", true);
 pref("extensions.zotero.autoRenameFiles", true);
+pref("extensions.zotero.autoRenameFiles.linked", false);
 pref("extensions.zotero.autoRenameFiles.fileTypes", "application/pdf");
 pref("extensions.zotero.attachmentRenameFormatString", "{%c - }{%y - }{%t{50}}");
 pref("extensions.zotero.capitalizeTitles", false);
@@ -69,8 +70,10 @@ pref("extensions.zotero.lastLongTagDelimiter", ";");
 pref("extensions.zotero.fallbackSort", "firstCreator,date,title,dateAdded");
 pref("extensions.zotero.sortCreatorAsString", false);
 
-//Tag Cloud
-pref("extensions.zotero.tagCloud", false);
+
+//Tag Selector
+pref("extensions.zotero.tagSelector.showAutomatic", true);
+pref("extensions.zotero.tagSelector.displayAllTags", false);
 
 // Keyboard shortcuts
 pref("extensions.zotero.keys.openZotero", "Z");

diff --git a/App/Zotero/extensions/[email protected]/install.rdf b/App/Zotero/extensions/[email protected]/install.rdf
@@ -4,7 +4,7 @@
 <Description about="urn:mozilla:install-manifest">
 	<em:id>[email protected]</em:id>
 	<em:name>Zotero LibreOffice Integration</em:name>
-	<em:version>5.0.14.SA.5.0.60</em:version>
+	<em:version>5.0.14.SA.5.0.61</em:version>
 	<em:creator>Center for History and New Media<br/>George Mason University</em:creator>
 	<em:developer>Simon Kornblith</em:developer>
 	<em:homepageURL>https://www.zotero.org</em:homepageURL>

diff --git a/...ero/extensions/[email protected]/components/zoteroWinWordIntegration.js b/...ero/extensions/[email protected]/components/zoteroWinWordIntegration.js
@@ -218,10 +218,10 @@ Application.prototype = {
 		init();
 		var docPtr = new document_t.ptr();
 		// For OneDrive stored documents we receive the in the form:
-		// https://[username]-my.sharepoint.com/personal/[username_url_thin]/Documents\Document1.docx
+		// https://[username]-my.sharepoint.com/personal/[username_url_thing]/Documents\Document1.docx
 		// But the document url is all stored with forward slashes in running-object table
 		if (documentName.indexOf('https://') == 0) {
-			documentName.replace(/\\/g, '/');
+			documentName = documentName.replace(/\\/g, '/');
 		}
 		checkStatus(f.getDocument(documentName, docPtr.address()));
 		return new Document(docPtr);

diff --git a/App/Zotero/extensions/[email protected]/install.rdf b/App/Zotero/extensions/[email protected]/install.rdf
@@ -4,7 +4,7 @@
 <Description about="urn:mozilla:install-manifest">
 	<em:id>[email protected]</em:id>
 	<em:name>Zotero Word for Windows Integration</em:name>
-	<em:version>5.0.11.SA.5.0.60</em:version>
+	<em:version>5.0.12.SA.5.0.61</em:version>
 	<em:creator>Center for History and New Media</em:creator>
 	<em:developer>Simon Kornblith</em:developer>
 	<em:homepageURL>https://www.zotero.org</em:homepageURL>

diff --git a/App/Zotero/pdfinfo.exe b/App/Zotero/pdfinfo.exe
diff --git a/App/Zotero/pdftotext.exe b/App/Zotero/pdftotext.exe
diff --git a/App/Zotero/uninstall/helper.exe b/App/Zotero/uninstall/helper.exe
diff --git a/App/Zotero/updater.exe b/App/Zotero/updater.exe
diff --git a/App/Zotero/zotero.exe b/App/Zotero/zotero.exe
diff --git a/App/Zotero/zotero.jar b/App/Zotero/zotero.jar
diff --git a/changelog.fr.md b/changelog.fr.md
@@ -1,5 +1,7 @@
 Historique des versions  :
 ----
+- 2019-03-11. Version 5.0.61 - Development Test 39 : Mise à jour vers Zotero 5.0.61.
+
 - 2019-01-10. Version 5.0.60 - Development Test 38 : Mise à jour vers Zotero 5.0.60.
 
 - 2018-11-12. Version 5.0.59 - Development Test 37 : Mise à jour vers Zotero 5.0.59.

diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,7 @@
 Versions history:
 ----
+- 2019-01-11. Version 5.0.61 - Development Test 39: Update to Zotero 5.0.61.
+
 - 2019-01-10. Version 5.0.60 - Development Test 38: Update to Zotero 5.0.60.
 
 - 2018-12-19. Version 5.0.59 - Development Test 37: Update to Zotero 5.0.59.