scriptoriumadmin/zotero
1
0
Fork 0
mirror of https://github.com/zotero/zotero.git synced 2026-09-07 08:26:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Select child attachment after a file is drag-dropped onto a top-level item (#5328)

Browse source 
And also handle attachments added via context menu

Fixes: zotero#5320
This commit is contained in:
abaevbog 2025-06-04 23:20:13 -07:00 • committed by GitHub
parent 51a62022e9
commit 6ff349d65d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 50 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
chrome/content/zotero/itemTree.jsx
View file

@ -2680,6 +2680,10 @@ var ItemTree = class ItemTree extends LibraryTree {
addedItems.push(item);
}
}
// Select children created after drag-drop onto a top-level item
if (parentItemID && addedItems.length) {
await this.selectItems(addedItems.map(item => item.id));
}
}
finally {
await Zotero.Notifier.commit(notifierQueue);

11
chrome/content/zotero/zoteroPane.js
View file

@ -4546,7 +4546,7 @@ var ZoteroPane = new function()
};
this.addAttachmentFromURI = Zotero.Promise.method(function (link, itemID) {
this.addAttachmentFromURI = async function (link, itemID) {
if (!this.canEdit()) {
this.displayCannotEditLibraryMessage();
return;
@ -4556,12 +4556,13 @@ var ZoteroPane = new function()
window.openDialog('chrome://zotero/content/attachLink.xhtml',
'zotero-attach-uri-dialog', 'centerscreen, modal', io);
if (!io.out) return;
return Zotero.Attachments.linkFromURL({
await Zotero.Attachments.linkFromURL({
url: io.out.link,
parentItemID: itemID,
title: io.out.title
});
});
await this.selectItem(item.id);
};
/**
* @param {Boolean} [link]
@ -4681,6 +4682,10 @@ var ZoteroPane = new function()
addedItems.push(item);
}
// Select added child attachments
if (parentItemID && addedItems.length) {
await this.selectItems(addedItems.map(item => item.id));
}
// Automatically retrieve metadata for top-level PDFs
if (!parentItemID) {
Zotero.RecognizeDocument.autoRecognizeItems(addedItems);

25
test/tests/itemTreeTest.js
View file

@ -1673,6 +1673,31 @@ describe("Zotero.ItemTree", function() {
assert.equal(pdfAttachment2.parentItemID, parentItem.id);
assert.equal(pdfAttachment2.getField('title'), 'test');
});
it("should select attachment after a file is dragged onto a top-level item", async function () {
let item = await createDataObject('item', { title: "Top-level Item" });
// a file is dropped onto an existing item
let itemIndex = zp.itemsView.getRowIndexByID(item.id);
let file = getTestDataDirectory();
file.append('test.pdf');
drop(itemIndex, 0, {
dropEffect: 'copy',
effectAllowed: 'copy',
types: ['application/x-moz-file'],
mozItemCount: 1,
mozGetDataAt: function (type, i) {
if (type == 'application/x-moz-file' && i == 0) {
return file;
}
}
});
await waitForNotifierEvent('add', 'item');
// the top-level item should be expanded
assert.isTrue(zp.itemsView.isContainerOpen(itemIndex));
// the child attachment that was added should be selected
assert.equal(zp.itemsView.selection.focused, itemIndex + 1);
});
});

13
test/tests/zoteroPaneTest.js
View file

@ -1693,6 +1693,19 @@ describe("ZoteroPane", function() {
assert.equal(epubAttachment.getField('title'), Zotero.getString('file-type-ebook'));
});
it("should select added file attachment", async function () {
let parentItem = await createDataObject('item');
let file = getTestDataDirectory();
file.append('test.pdf');
let [pdfAttachment1] = await zp.addAttachmentFromDialog(false, parentItem.id, [file.path]);
let parentItemIndex = zp.itemsView.getRowIndexByID(parentItem.id);
assert.equal(zp.itemsView.selection.focused, parentItemIndex + 1);
let selected = zp.itemsView.getSelectedItems()[0];
assert.equal(selected.id, pdfAttachment1.id);
});
describe("Linked file renaming", function () {
before(() => {
Zotero.Prefs.set('autoRenameFiles.linked', true);