mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix handling of some old-style URLs in zotero:// protocol handler

Browse source
This commit is contained in:
Dan Stillman 2017-02-08 00:20:52 -05:00
parent fe063faf00
commit 1ea80c4352
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
components/zotero-protocol-handler.js
View file

@ -137,7 +137,7 @@ function ZoteroProtocolHandler() {
params.scopeObject = 'collections'; params.scopeObject = 'collections';
var lkh = Zotero.Collections.parseLibraryKeyHash(params.id); var lkh = Zotero.Collections.parseLibraryKeyHash(params.id);
if (lkh) { if (lkh) {
params.libraryID = lkh.libraryID; params.libraryID = lkh.libraryID || userLibraryID;
params.scopeObjectKey = lkh.key; params.scopeObjectKey = lkh.key;
} }
else { else {
@ -149,7 +149,7 @@ function ZoteroProtocolHandler() {
params.scopeObject = 'searches'; params.scopeObject = 'searches';
var lkh = Zotero.Searches.parseLibraryKeyHash(this.id); var lkh = Zotero.Searches.parseLibraryKeyHash(this.id);
if (lkh) { if (lkh) {
params.libraryID = lkh.libraryID; params.libraryID = lkh.libraryID || userLibraryID;
params.scopeObjectKey = lkh.key; params.scopeObjectKey = lkh.key;
} }
else { else {
@ -159,7 +159,7 @@ function ZoteroProtocolHandler() {
}); });
router.add('items/:ids/html/report.html', function () { router.add('items/:ids/html/report.html', function () {
var ids = this.ids.split('-'); var ids = this.ids.split('-');
params.libraryID = ids[0].split('_')[0]; params.libraryID = ids[0].split('_')[0] || userLibraryID;
params.itemKey = ids.map(x => x.split('_')[1]); params.itemKey = ids.map(x => x.split('_')[1]);
delete params.ids; delete params.ids;
}); });
@ -524,7 +524,7 @@ function ZoteroProtocolHandler() {
params.scopeObject = 'collections'; params.scopeObject = 'collections';
var lkh = Zotero.Collections.parseLibraryKeyHash(params.id); var lkh = Zotero.Collections.parseLibraryKeyHash(params.id);
if (lkh) { if (lkh) {
params.libraryID = lkh.libraryID; params.libraryID = lkh.libraryID || userLibraryID;
params.scopeObjectKey = lkh.key; params.scopeObjectKey = lkh.key;
} }
else { else {
@ -537,7 +537,7 @@ function ZoteroProtocolHandler() {
params.scopeObject = 'searches'; params.scopeObject = 'searches';
var lkh = Zotero.Searches.parseLibraryKeyHash(params.id); var lkh = Zotero.Searches.parseLibraryKeyHash(params.id);
if (lkh) { if (lkh) {
params.libraryID = lkh.libraryID; params.libraryID = lkh.libraryID || userLibraryID;
params.scopeObjectKey = lkh.key; params.scopeObjectKey = lkh.key;
} }
else { else {
@ -827,10 +827,10 @@ function ZoteroProtocolHandler() {
router.add('groups/:groupID/items/:objectKey'); router.add('groups/:groupID/items/:objectKey');
// Old-style URLs // Old-style URLs
router.add('item/:id', function () { router.add('items/:id', function () {
var lkh = Zotero.Items.parseLibraryKeyHash(params.id); var lkh = Zotero.Items.parseLibraryKeyHash(params.id);
if (lkh) { if (lkh) {
params.libraryID = lkh.libraryID; params.libraryID = lkh.libraryID || userLibraryID;
params.objectKey = lkh.key; params.objectKey = lkh.key;
} }
else { else {