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

Don't include parent title in tab title for secondary attachments

Browse source 
As suggested in https://github.com/zotero/zotero/issues/2731#issuecomment-1201382522
This commit is contained in:
Dan Stillman 2023-08-19 05:04:40 -04:00
parent 4f19b1d13e
commit 38d0750dd3
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
chrome/content/zotero/xpcom/reader.js
View file

@ -548,13 +548,17 @@ class ReaderInstance {
readerTitle = item.attachmentFilename;
}
else if (parentItem) {
let attachment = await parentItem.getBestAttachment();
let isPrimaryAttachment = attachment && attachment.id == item.id;
let parts = [];
// Windows displays bidi control characters as placeholders in window titles, so strip them
// See https://github.com/mozilla-services/screenshots/issues/4863
let unformatted = Zotero.isWin;
let creator = parentItem.getField('firstCreator', unformatted);
let year = parentItem.getField('year');
let title = parentItem.getDisplayTitle();
// Only include parent title if primary attachment
let title = isPrimaryAttachment ? parentItem.getDisplayTitle() : false;
// If creator is missing fall back to titleCreatorYear
if (type === 'creatorYearTitle' && creator) {
parts = [creator, year, title];
@ -567,9 +571,8 @@ class ReaderInstance {
parts = [title, creator, year];
}
// If not primary attachment, add attachment title
let attachment = await parentItem.getBestAttachment();
if (!attachment || attachment.id != item.id) {
// If not primary attachment, show attachment title first
if (!isPrimaryAttachment) {
parts.unshift(item.getDisplayTitle());
}