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

Use new attachment fields for annotations import

Browse source
This commit is contained in:
Martynas Bagdonas 2021-01-08 15:19:15 +02:00 • committed by Dan Stillman
parent ebc0ca2462
commit c13ac32ad2
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
chrome/content/zotero/xpcom/pdfWorker/manager.js
View file

@ -242,23 +242,24 @@ class PDFWorker {
annotation.key = Zotero.DataObjectUtilities.generateKey(); annotation.key = Zotero.DataObjectUtilities.generateKey();
await Zotero.Annotations.saveFromJSON(attachment, annotation); await Zotero.Annotations.saveFromJSON(attachment, annotation);
} }
Zotero.PDF.hasUnmachedAnnotations[itemID] = false; attachment.attachmentHasUnimportedAnnotations = false;
} }
else { else {
Zotero.PDF.hasUnmachedAnnotations[itemID] = !!annotations.length; attachment.attachmentHasUnimportedAnnotations = !!annotations.length;
} }
for (let reader of Zotero.Reader._readers) { for (let reader of Zotero.Reader._readers) {
if (reader._itemID === itemID) { if (reader._itemID === itemID) {
reader.toggleImportPrompt(!!Zotero.PDF.hasUnmachedAnnotations[itemID]); reader.toggleImportPrompt(attachment.attachmentHasUnimportedAnnotations);
} }
} }
Zotero.PDF.dateChecked[itemID] = Zotero.Date.dateToISO(new Date()); attachment.attachmentLastProcessedModificationTime = await attachment.attachmentModificationTime;
await attachment.saveTx();
return annotations.length; return annotations.length;
}); });
} }
/** /**
* Import children PDF attachment annotations * Import annotations for each PDF attachment of parent item
* *
* @param {Zotero.Item} item * @param {Zotero.Item} item
*/ */

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

@ -46,7 +46,7 @@ class ReaderInstance {
annotations, annotations,
state, state,
location, location,
promptImport: !!Zotero.PDF.hasUnmachedAnnotations[this._itemID], promptImport: item.attachmentHasUnimportedAnnotations,
showItemPaneToggle: this._showItemPaneToggle, showItemPaneToggle: this._showItemPaneToggle,
sidebarWidth: this._sidebarWidth, sidebarWidth: this._sidebarWidth,
sidebarOpen: this._sidebarOpen, sidebarOpen: this._sidebarOpen,
@ -811,8 +811,7 @@ class Reader {
async triggerAnnotationsImportCheck(itemID) { async triggerAnnotationsImportCheck(itemID) {
let item = await Zotero.Items.getAsync(itemID); let item = await Zotero.Items.getAsync(itemID);
let mtime = await item.attachmentModificationTime; let mtime = await item.attachmentModificationTime;
let dateModified = Zotero.Date.dateToISO(new Date(mtime)); if (item.attachmentLastProcessedModificationTime < mtime) {
if (!Zotero.PDF.dateChecked[itemID] || Zotero.PDF.dateChecked[itemID] < dateModified) {
await Zotero.PDFWorker.import(itemID, false); await Zotero.PDFWorker.import(itemID, false);
} }
} }