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

Change user library from 0 to 1

Browse source 
0 allowed for some accidental behavior due to old code expecting NULL,
and it prevented easy checks (``if (!libraryID)``) for a passed
libraryID. Code now uses Zotero.Libraries.userLibraryID instead of a
hard-coded value (except in schema.js). Functions can still make
libraryID optional, but they should then use
Zotero.Libraries.userLibraryID if that's to mean the user library.

There might be some code that still expects 0 that I missed.
This commit is contained in:
Dan Stillman 2015-03-10 02:27:56 -04:00
parent 9d353b4e25
commit 1c8abf3841
29 changed files with 134 additions and 152 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -90,6 +90,8 @@ function ZoteroProtocolHandler() {
newChannel: function (uri) {
return new AsyncChannel(uri, function* () {
var userLibraryID = Zotero.Libraries.userLibraryID;
var path = uri.path;
if (!path) {
return 'Invalid URL';
@ -118,13 +120,13 @@ function ZoteroProtocolHandler() {
// Items within a collection or search
router.add('library/:scopeObject/:scopeObjectKey/items/report.html', function () {
params.libraryID = 0;
params.libraryID = userLibraryID;
});
router.add('groups/:groupID/:scopeObject/:scopeObjectKey/items/report.html');
// All items
router.add('library/items/report.html', function () {
params.libraryID = 0;
params.libraryID = userLibraryID;
});
router.add('groups/:groupID/items/report.html');
@ -472,6 +474,8 @@ function ZoteroProtocolHandler() {
newChannel: function (uri) {
return new AsyncChannel(uri, function* () {
var userLibraryID = Zotero.Libraries.userLibraryID;
path = uri.spec.match(/zotero:\/\/[^/]+(.*)/)[1];
if (!path) {
this.contentType = 'text/html';
@ -483,14 +487,14 @@ function ZoteroProtocolHandler() {
// HTML
router.add('library/:scopeObject/:scopeObjectKey', function () {
params.libraryID = 0;
params.libraryID = userLibraryID;
params.controller = 'html';
});
router.add('groups/:groupID/:scopeObject/:scopeObjectKey', function () {
params.controller = 'html';
});
router.add('library', function () {
params.libraryID = 0;
params.libraryID = userLibraryID;
params.controller = 'html';
});
router.add('groups/:groupID', function () {
@ -499,14 +503,14 @@ function ZoteroProtocolHandler() {
// Data
router.add('data/library/:scopeObject/:scopeObjectKey', function () {
params.libraryID = 0;
params.libraryID = userLibraryID;
params.controller = 'data';
});
router.add('data/groups/:groupID/:scopeObject/:scopeObjectKey', function () {
params.controller = 'data';
});
router.add('data/library', function () {
params.libraryID = 0;
params.libraryID = userLibraryID;
params.controller = 'data';
});
router.add('data/groups/:groupID', function () {
@ -542,7 +546,7 @@ function ZoteroProtocolHandler() {
});
router.add('/', function () {
params.controller = 'html';
params.libraryID = 0;
params.libraryID = userLibraryID;
});
var parsed = router.run(path);
@ -794,6 +798,8 @@ function ZoteroProtocolHandler() {
var SelectExtension = {
newChannel: function (uri) {
return new AsyncChannel(uri, function* () {
var userLibraryID = Zotero.Libraries.userLibraryID;
var path = uri.path;
if (!path) {
return 'Invalid URL';
@ -809,13 +815,13 @@ function ZoteroProtocolHandler() {
// Item within a collection or search
router.add('library/:scopeObject/:scopeObjectKey/items/:objectKey', function () {
params.libraryID = 0;
params.libraryID = userLibraryID;
});
router.add('groups/:groupID/:scopeObject/:scopeObjectKey/items/:objectKey');
// All items
router.add('library/items/:objectKey', function () {
params.libraryID = 0;
params.libraryID = userLibraryID;
});
router.add('groups/:groupID/items/:objectKey');