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

Desktop: Fixed clipping certain pages that contain images within links

Browse Source
This commit is contained in:
Laurent Cozic 2023-02-24 18:49:27 +00:00
parent d1e545ac2c
commit 92cf5abd08
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/lib/services/rest/routes/notes.ts
View File

@ -265,12 +265,22 @@ function replaceUrlsByResources(markupLanguage: number, md: string, urls: any, i
return Resource.internalUrl(urlInfo.resource);
});
} else {
// Proper Regex:
//
// /(!\[.*?\]\()([^\s\)]+)(.*?\))/g
//
// Broken regex when [embedded_pdf] support was added, and fixed with
// `before.startsWith('[![')` hack. But ideally that function should be
// unit tested to prevent it from being broken again.
//
// /(!?\[.*?\]\()([^\s\)]+)(.*?\))/g
//
// eslint-disable-next-line no-useless-escape
return md.replace(/(!?\[.*?\]\()([^\s\)]+)(.*?\))/g, (_match: any, before: string, url: string, after: string) => {
let type = 'link';
if (before.startsWith('[embedded_pdf]')) {
type = 'pdf';
} else if (before.startsWith('![')) {
} else if (before.startsWith('![') || before.startsWith('[![')) {
type = 'image';
}