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

Upgrade note-editor schema to v5:

Browse source 
- Make citation node a leaf node.
- Don't parse citation node inner text.
- Don't trigger citation inner text updating on citation item changes.
- Format citation text only when serializing note HTML.
- Wrap individual citation items into `<span class="citation-item"></span>`.
This commit is contained in:
Martynas Bagdonas 2021-09-22 19:30:44 +03:00
parent 4cfa230508
commit 47d4949b2a
2 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -44,7 +44,7 @@ const DOWNLOADED_IMAGE_TYPE = [
];
// Schema version here has to be the same as in note-editor!
const SCHEMA_VERSION = 4;
const SCHEMA_VERSION = 5;
class EditorInstance {
constructor() {
@ -372,8 +372,7 @@ class EditorInstance {
let citationWithData = JSON.parse(JSON.stringify(citation));
citationWithData.citationItems[0].itemData = itemData;
let formatted = this._formatCitation(citationWithData);
citationHTML = `<span class="citation" data-citation="${encodeURIComponent(JSON.stringify(citation))}">(${formatted})</span>`;
citationHTML = `<span class="citation" data-citation="${encodeURIComponent(JSON.stringify(citation))}">${formatted}</span>`;
}
// Image
@ -440,7 +439,7 @@ class EditorInstance {
properties: {}
};
let formatted = this._formatCitation(citation);
html += `<p><span class="citation" data-citation="${encodeURIComponent(JSON.stringify(citation))}">(${formatted})</span></p>`;
html += `<p><span class="citation" data-citation="${encodeURIComponent(JSON.stringify(citation))}">${formatted}</span></p>`;
}
else if (item.isNote()) {
let note = item.note;
@ -1133,7 +1132,9 @@ class EditorInstance {
}
_formatCitation(citation) {
return citation.citationItems.map(x => this._formatCitationItemPreview(x)).join('; ');
return '(' + citation.citationItems.map((x) => {
return `<span class="citation-item">${this._formatCitationItemPreview(x)}</span>`;
}).join('; ') + ')';
}
_arrayBufferToBase64(buffer) {

2
note-editor

@ -1 +1 @@
Subproject commit 4ba41a41689448aecc21a72aec0559d39ca4509e
Subproject commit ddcba7de027099cdc5a792e2dc186a810e72d556