self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-24 10:27:10 +02:00
Code Issues Releases Activity

Chore: Merge release-2.13 into dev (#9698)

Browse Source 
Co-authored-by: Laurent Cozic <laurent22@users.noreply.github.com>
This commit is contained in:
Henry Heino 2024-01-11 13:22:52 -08:00 committed by GitHub
parent 150ee7631e
commit 97a04ea9e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/renderer/HtmlToHtml.ts
View File

@ -42,6 +42,11 @@ interface RenderOptions {
itemIdToUrl?: ItemIdToUrlHandler; itemIdToUrl?: ItemIdToUrlHandler;
allowedFilePrefixes?: string[]; allowedFilePrefixes?: string[];
whiteBackgroundNoteRendering?: boolean; whiteBackgroundNoteRendering?: boolean;
// For compatibility with MdToHtml options:
plugins?: {
link_open?: { linkRenderingType?: number };
};
} }
// https://github.com/es-shims/String.prototype.trimStart/blob/main/implementation.js // https://github.com/es-shims/String.prototype.trimStart/blob/main/implementation.js
@ -107,7 +112,7 @@ export default class HtmlToHtml {
...options, ...options,
}; };
const cacheKey = md5(escape(markup)); const cacheKey = md5(escape(JSON.stringify({ markup, options })));
let html = this.cache_.value(cacheKey); let html = this.cache_.value(cacheKey);
if (!html) { if (!html) {
@ -142,6 +147,7 @@ export default class HtmlToHtml {
ResourceModel: this.ResourceModel_, ResourceModel: this.ResourceModel_,
postMessageSyntax: options.postMessageSyntax, postMessageSyntax: options.postMessageSyntax,
enableLongPress: options.enableLongPress, enableLongPress: options.enableLongPress,
...options.plugins?.link_open,
}); });
if (!r.html) return null; if (!r.html) return null;