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

Sort multiple levels of items when generating API JSON

Browse source 
Added Zotero.DataObjects.sortByParent() to sort child items immediately
after their parent items. Zotero.DataObjects.sortByLevel(), which is
used for collections, sorts each level together, but that's less
appropriate for items where, e.g., an embedded-image attachment should
immediately follow the note that depends on it.
This commit is contained in:
Dan Stillman 2020-09-08 04:02:25 -04:00
parent f662b58331
commit a94323fc15
8 changed files with 362 additions and 158 deletions
Download patch file Download diff file Expand all files Collapse all files

36
test/content/support.js
View file

@ -907,7 +907,8 @@ function importFileAttachment(filename, options = {}) {
filename.split('/').forEach((part) => file.append(part));
let importOptions = {
file,
parentItemID: options.parentID
parentItemID: options.parentID,
title: options.title
};
Object.assign(importOptions, options);
return Zotero.Attachments.importFromFile(importOptions);
@ -924,7 +925,20 @@ function importHTMLAttachment() {
}
async function createAnnotation(type, parentItem) {
async function importPDFAttachment(parentItem, options = {}) {
var attachment = await importFileAttachment(
'test.pdf',
{
contentType: 'application/pdf',
parentID: parentItem ? parentItem.id : null,
title: options.title
}
);
return attachment;
}
async function createAnnotation(type, parentItem, options = {}) {
var annotation = new Zotero.Item('annotation');
annotation.parentID = parentItem.id;
annotation.annotationType = type;
@ -941,11 +955,29 @@ async function createAnnotation(type, parentItem) {
[314.4, 412.8, 556.2, 609.6]
]
};
if (options.tags) {
annotation.setTags(options.tags);
}
await annotation.saveTx();
return annotation;
}
async function createEmbeddedImage(parentItem, options = {}) {
var attachment = await Zotero.Attachments.importEmbeddedImage({
blob: await File.createFromFileName(
OS.Path.join(getTestDataDirectory().path, 'test.png')
),
parentItemID: parentItem.id
});
if (options.tags) {
attachment.setTags(options.tags);
await attachment.saveTx();
}
return attachment;
}
/**
* Sets the fake XHR server to response to a given response
*