' + imageHTML + [highlightHTML, citationHTML, commentHTML].filter(x => x).join(' ') + '
\n'; + } + return html; + } + + async _digestItems(ids) { + let html = ''; + for (let id of ids) { + let item = await Zotero.Items.getAsync(id); + if (!item) { + continue; + } + if (item.isRegularItem()) { + let citation = { + citationItems: [{ + uris: [Zotero.URI.getItemURI(item)], + itemData: Zotero.Cite.System.prototype.retrieveItem(item) + }], + properties: {} + }; + let formatted = (await this._getFormattedCitationParts(citation)).join(';'); + html += `(${formatted})
`; + } + else if (item.isNote()) { + // TODO: Remove when fixed + item._loaded.childItems = true; + let note = item.note; + let attachments = await Zotero.Items.getAsync(item.getAttachments()); + for (let attachment of attachments) { + let path = await attachment.getFilePathAsync(); + let buf = await OS.File.read(path, {}); + buf = new Uint8Array(buf).buffer; + let blob = new (Zotero.getMainWindow()).Blob([buf], { type: attachment.attachmentContentType }); + let clonedAttachment = await Zotero.Attachments.importEmbeddedImage({ + blob, + parentItemID: this._item.id, + saveOptions: { + notifierData: { + noteEditorID: this.instanceID + } + } + }); + note = note.replace(attachment.key, clonedAttachment.key); + } + html += `${note}`; } } - return list; + return html; } _messageHandler = async (e) => { @@ -225,40 +287,17 @@ class EditorInstance { switch (message.action) { case 'insertObject': { let { type, data, pos } = message; - let list = []; + let html = ''; if (type === 'zotero/item') { let ids = data.split(',').map(id => parseInt(id)); - for (let id of ids) { - let item = await Zotero.Items.getAsync(id); - if (!item) { - continue; - } - - if (item.isRegularItem()) { - let citation = { - citationItems: [{ - uris: [Zotero.URI.getItemURI(item)], - itemData: Zotero.Cite.System.prototype.retrieveItem(item) - }], - properties: {} - }; - - let formattedCitation = (await this._getFormattedCitationParts(citation)).join(';'); - - list.push({ citation, formattedCitation }); - } - else if (item.isNote()) { - let note = await this._digestExternalNote(item.id); - list.push({ note }); - } - } + html = await this._digestItems(ids); } else if (type === 'zotero/annotation') { let annotations = JSON.parse(data); - list = await this._annotationsToInsertionList(annotations); + html = await this._digestAnnotations(annotations); } - if (list.length) { - this._postMessage({ action: 'insertAnnotationsAndCitations', list, pos }); + if (html) { + this._postMessage({ action: 'insertHtml', pos, html }); } return; } @@ -329,9 +368,9 @@ class EditorInstance { } case 'generateCitation': { let { citation, pos } = message; - let formattedCitation = (await this._getFormattedCitationParts(citation)).join(';'); - let list = [{ citation, formattedCitation }]; - this._postMessage({ action: 'insertAnnotationsAndCitations', list, pos }); + let formatted = (await this._getFormattedCitationParts(citation)).join(';'); + let html = `(${formatted})`; + this._postMessage({ action: 'insertHtml', pos, html }); return; } case 'subscribeProvider': { @@ -674,7 +713,7 @@ class EditorInstance { u8arr[n] = bstr.charCodeAt(n); } - return new this._iframeWindow.Blob([u8arr], { type: mime }); + return new (Zotero.getMainWindow()).Blob([u8arr], { type: mime }); } return null; } @@ -835,6 +874,37 @@ class EditorInstance { wrappedJSObject: io }); } + + static canCreateNoteFromAnnotations(item) { + return item.parentID && item.isAttachment() && item.attachmentContentType === 'application/pdf'; + } + + static async createNoteFromAnnotations(attachmentItem) { + if (!this.canCreateNoteFromAnnotations(attachmentItem)) { + return; + } + let annotations = attachmentItem.getAnnotations(); + if (!annotations.length) { + return; + } + let note = new Zotero.Item('note'); + note.libraryID = attachmentItem.libraryID; + note.parentID = attachmentItem.parentID; + await note.saveTx(); + let editorInstance = new EditorInstance(); + editorInstance._item = note; + let jsonAnnotations = []; + for (let annotation of annotations) { + annotation._loaded.childItems = true; + let jsonAnnotation = await Zotero.Annotations.toJSON(annotation); + jsonAnnotation.itemId = attachmentItem.id; + jsonAnnotations.push(jsonAnnotation); + } + let html = `(${(new Date()).toLocaleString()})
\n`; + html += await editorInstance._digestAnnotations(jsonAnnotations); + note.setNote(html); + await note.saveTx(); + } } Zotero.EditorInstance = EditorInstance; diff --git a/chrome/content/zotero/zoteroPane.js b/chrome/content/zotero/zoteroPane.js index a3c061ccf0..ece61940d9 100644 --- a/chrome/content/zotero/zoteroPane.js +++ b/chrome/content/zotero/zoteroPane.js @@ -2745,7 +2745,8 @@ var ZoteroPane = new function() 'createParent', 'renameAttachments', 'reindexItem', - 'importAnnotations' + 'importAnnotations', + 'createNoteFromAnnotations' ]; var m = {}; @@ -2973,6 +2974,10 @@ var ZoteroPane = new function() if (Zotero.PDFWorker.canImport(item)) { show.push(m.importAnnotations); } + + if (Zotero.EditorInstance.canCreateNoteFromAnnotations(item)) { + show.push(m.createNoteFromAnnotations); + } } // Update attachment submenu @@ -4666,7 +4671,16 @@ var ZoteroPane = new function() } } }; - + + this.createNoteFromSelected = function () { + if (!this.canEdit()) { + this.displayCannotEditLibraryMessage(); + return; + } + + let item = this.getSelectedItems()[0]; + Zotero.EditorInstance.createNoteFromAnnotations(item); + }; this.createEmptyParent = async function (item) { await Zotero.DB.executeTransaction(async function () { diff --git a/chrome/content/zotero/zoteroPane.xul b/chrome/content/zotero/zoteroPane.xul index b2d112bda9..63704375ae 100644 --- a/chrome/content/zotero/zoteroPane.xul +++ b/chrome/content/zotero/zoteroPane.xul @@ -312,6 +312,7 @@ +