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

Don't include quotes when {{highlight}} is placed in a blockquote

Browse source 
Fixes #2697
This commit is contained in:
Martynas Bagdonas 2022-07-12 12:00:15 +03:00 committed by Dan Stillman
parent fcb63465ac
commit 4ab154c4bf
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1356,6 +1356,14 @@ class EditorInstanceUtilities {
template = '<p>{{image}}<br/>{{citation}} {{comment}}</p>'; template = '<p>{{image}}<br/>{{citation}} {{comment}}</p>';
} }
Zotero.debug('Using note template:');
Zotero.debug(template);
template = template.replace(
/(<blockquote>[^<>]*?)({{highlight}})([\s\S]*?<\/blockquote>)/g,
(match, p1, p2, p3) => p1 + "{{highlight quotes='false'}}" + p3
);
let vars = { let vars = {
color: annotation.color || '', color: annotation.color || '',
// Include quotation marks by default, but allow to disable with `quotes='false'` // Include quotation marks by default, but allow to disable with `quotes='false'`
@ -1365,8 +1373,7 @@ class EditorInstanceUtilities {
image: imageHTML, image: imageHTML,
tags: (attrs) => (annotation.tags && annotation.tags.map(tag => tag.name) || []).join(attrs.join || ' ') tags: (attrs) => (annotation.tags && annotation.tags.map(tag => tag.name) || []).join(attrs.join || ' ')
}; };
Zotero.debug('Using note template:');
Zotero.debug(template);
let templateHTML = Zotero.Utilities.Internal.generateHTMLFromTemplate(template, vars); let templateHTML = Zotero.Utilities.Internal.generateHTMLFromTemplate(template, vars);
// Remove some spaces at the end of paragraph // Remove some spaces at the end of paragraph
templateHTML = templateHTML.replace(/([\s]*)(<\/p)/g, '$2'); templateHTML = templateHTML.replace(/([\s]*)(<\/p)/g, '$2');