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

Fixed MdToHtml regression

Browse Source
This commit is contained in:
Laurent Cozic 2022-04-26 12:52:48 +01:00
parent 790c98ca40
commit 8abdbfe2bd
2 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
packages/app-cli/tests/MdToHtml.ts
View File

@ -60,16 +60,20 @@ describe('MdToHtml', function() {
actualHtml = actualHtml.replace(/\r?\n/g, '\n');
if (actualHtml !== expectedHtml) {
console.info('');
console.info(`Error converting file: ${mdFilename}`);
console.info('--------------------------------- Got:');
console.info(actualHtml);
console.info('--------------------------------- Raw:');
console.info(actualHtml.split('\n'));
console.info('--------------------------------- Expected:');
console.info(expectedHtml.split('\n'));
console.info('--------------------------------------------');
console.info('');
const msg: string[] = [
'',
`Error converting file: ${mdFilename}`,
'--------------------------------- Got:',
actualHtml,
'--------------------------------- Raw:',
actualHtml.split('\n'),
'--------------------------------- Expected:',
expectedHtml.split('\n'),
'--------------------------------------------',
'',
];
console.info(msg.join('\n'));
expect(false).toBe(true);
// return;

10
packages/renderer/htmlUtils.ts
View File

@ -180,7 +180,10 @@ class HtmlUtils {
onopentag: (name: string, attrs: any) => {
tagStack.push(name.toLowerCase());
if (disallowedTags.includes(currentTag())) disallowedTagDepth++;
if (disallowedTags.includes(currentTag())) {
disallowedTagDepth++;
return;
}
if (disallowedTagDepth) return;
@ -242,7 +245,10 @@ class HtmlUtils {
if (current === name.toLowerCase()) tagStack.pop();
if (disallowedTags.includes(current)) disallowedTagDepth--;
if (disallowedTags.includes(current)) {
disallowedTagDepth--;
return;
}
if (disallowedTagDepth) return;