scriptoriumadmin/zotero
1
0
Fork 0
mirror of https://github.com/zotero/zotero.git synced 2026-10-04 02:31:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Unify getSelectedItems() and getSortedItems()

Browse source
This commit is contained in:
Abe Jellinek 2026-05-12 14:49:08 -04:00
parent 1475043863
commit b1a026148e
2 changed files with 22 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
chrome/content/zotero/fileInterface.js
View file

@ -228,10 +228,7 @@ var Zotero_File_Interface = new function () {
*/
function exportItems() {
var exporter = new Zotero_File_Exporter();
let itemIDs = ZoteroPane_Local.getSelectedItems(true);
// Get selected item IDs in the item tree order
itemIDs = ZoteroPane_Local.getSortedItems(true).filter(id => itemIDs.includes(id));
exporter.items = Zotero.Items.get(itemIDs);
exporter.items = ZoteroPane.getSelectedItems({ inSortOrder: true });
if(!exporter.items || !exporter.items.length) throw("no items currently selected");
exporter.save();

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

@ -2700,12 +2700,7 @@ var ZoteroPane = new function () {
this.copySelectedItemsToClipboard = function (asCitations) {
var items = [];
let itemIDs = this.getSelectedItems(true);
// Get selected item IDs in the item tree order
itemIDs = this.getSortedItems(true).filter(id => itemIDs.includes(id));
items = Zotero.Items.get(itemIDs);
var items = this.getSelectedItems({ inSortOrder: true });
if (!items.length) {
return;
}
@ -2773,28 +2768,7 @@ var ZoteroPane = new function () {
throw new Error('toWebLibrary is only valid for item links');
}
let items = [];
let selectedAnnotation = null;
if (Zotero_Tabs.selectedID != 'zotero-pane') {
var reader = Zotero.Reader.getByTabID(Zotero_Tabs.selectedID);
if (reader) {
let item = Zotero.Items.get(reader.itemID);
items = [item];
let selectedAnnotationKeys = reader.selectedAnnotationKeys;
if (selectedAnnotationKeys.length === 1) {
selectedAnnotation = Zotero.Items.getByLibraryAndKey(item.libraryID, selectedAnnotationKeys[0]);
}
}
}
else {
let itemIDs = this.getSelectedItems(true);
// Get selected item IDs in the item tree order
itemIDs = this.getSortedItems(true)
.filter(id => itemIDs.includes(id));
items = Zotero.Items.get(itemIDs);
}
let items = this.getSelectedItems({ asChildren: true, inSortOrder: true });
if (!items.length) {
return;
}
@ -3200,26 +3174,37 @@ var ZoteroPane = new function () {
};
/*
/**
* Return an array of Item objects for selected items
*
* If asIDs is true, return an array of itemIDs instead
* @param {Object | boolean} [options] If boolean, sets asIDs
* @param {boolean} [options.asIDs]
* @param {boolean} [options.asChildren] In reader tabs, return the attachment, not the parent item
* @param {boolean} [options.inSortOrder] In library tabs, return the items in the order they appear in the view
*/
this.getSelectedItems = function (asIDs) {
this.getSelectedItems = function (options = {}) {
if (typeof options === 'boolean') {
options = { asIDs: options };
}
switch (Zotero_Tabs.selectedType) {
case 'library':
case 'library': {
if (!this.itemsView) {
return [];
}
return this.itemsView.getSelectedItems(asIDs);
let items = this.itemsView.getSelectedItems(options.asIDs);
if (options.inSortOrder) {
return this.itemsView.getSortedItems(options.asIDs).filter(item => items.includes(item));
}
return items;
}
case 'reader': {
let reader = Zotero.Reader.getByTabID(Zotero_Tabs.selectedID);
if (reader) {
let item = Zotero.Items.get(reader.itemID);
if (item.parentItem) {
if (!options.asChildren && item.parentItem) {
item = item.parentItem;
}
return asIDs ? [item.id] : [item];
return options.asIDs ? [item.id] : [item];
}
return [];
}
@ -3250,7 +3235,7 @@ var ZoteroPane = new function () {
}
return this.itemsView.getSortedItems(asIDs);
default:
// ALl non-library tabs: Visible items == "selected" items
// All non-library tabs: Visible items == "selected" items
return this.getSelectedItems(asIDs);
}
};