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

Properly trigger note image attachment sync and display it when finished

Browse source
This commit is contained in:
Martynas Bagdonas 2024-02-16 14:36:05 +02:00
parent d47ed5f747
commit 009a2ca38a
2 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
chrome/content/zotero/elements/noteEditor.js
View file

@ -87,7 +87,7 @@
});
this.append(content);
this._notifierID = Zotero.Notifier.registerObserver(this, ['item'], 'noteEditor');
this._notifierID = Zotero.Notifier.registerObserver(this, ['item', 'file'], 'noteEditor');
this.notitle = !!this.getAttribute('notitle');
}

32
chrome/content/zotero/xpcom/editorInstance.js
View file

@ -689,21 +689,27 @@ class EditorInstance {
let { id, type, data } = subscription;
if (type === 'image') {
let { attachmentKey } = data;
let item = Zotero.Items.getByLibraryAndKey(this._item.libraryID, attachmentKey);
// Note: Images aren't visible in merge dialog because:
// - Attachments aren't downloaded at the time
// - We are checking if attachments belong to the current note
if (item.parentID === this._item.id) {
if (await item.getFilePathAsync()) {
let src = await this._getDataURL(item);
this._postMessage({ action: 'notifySubscription', id, data: { src } });
let n = 0;
// For now wait up to 60 seconds, as there is no point to wait for very long sync to finish
while (n++ < 60) {
let item = Zotero.Items.getByLibraryAndKey(this._item.libraryID, attachmentKey);
// Attachment item (not the file) might not be synced at the time
if (!item && Zotero.Sync.Runner.syncInProgress) {
await Zotero.Promise.delay(1000);
continue;
}
else {
await Zotero.Notes.ensureEmbeddedImagesAreAvailable(this._item);
// this._postMessage({ action: 'notifySubscription', id, data: { src: 'error' } });
// Check if the attachment is actually the child
if (item.parentID === this._item.id) {
if (await item.getFilePathAsync()) {
let src = await this._getDataURL(item);
this._postMessage({ action: 'notifySubscription', id, data: { src } });
}
else {
await Zotero.Notes.ensureEmbeddedImagesAreAvailable(this._item);
// this._postMessage({ action: 'notifySubscription', id, data: { src: 'error' } });
}
}
break;
}
}
}