the-djmaze/snappymail
1
1
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2025-02-25 07:16:21 +08:00
Code Issues Projects Releases Packages Wiki Activity

Solve empty lines in HTML -> Plain conversion for #462

Browse source
This commit is contained in:
the-djmaze 2022-07-20 12:34:30 +02:00
parent f7555abed7
commit 4238834cb5
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
dev/Common/Html.js
View file

@ -409,9 +409,6 @@ export const
.replace(/<t[dh](\s[\s\S]*?)?>/gi, '\t') .replace(/<t[dh](\s[\s\S]*?)?>/gi, '\t')
.replace(/<\/tr(\s[\s\S]*?)?>/gi, '\n'); .replace(/<\/tr(\s[\s\S]*?)?>/gi, '\n');
// Convert line-breaks
forEach('br', br => br.replaceWith('\n'));
// lines // lines
forEach('hr', node => node.replaceWith(`\n\n${hr}\n\n`)); forEach('hr', node => node.replaceWith(`\n\n${hr}\n\n`));
@ -458,10 +455,17 @@ export const
// Italic // Italic
forEach('i,em', i => i.replaceWith(`*${i.textContent}*`)); forEach('i,em', i => i.replaceWith(`*${i.textContent}*`));
// Convert line-breaks
tpl.innerHTML = tpl.innerHTML
.replace(/\n{3,}/gm, '\n\n')
.replace(/\n<br[^>]*>/g, '\n')
.replace(/<br[^>]*>\n/g, '\n');
forEach('br', br => br.replaceWith('\n'));
// Blockquotes must be last // Blockquotes must be last
blockquotes(tpl.content); blockquotes(tpl.content);
return (tpl.content.textContent || '').replace(/\n{3,}/gm, '\n\n').trim(); return (tpl.content.textContent || '').trim();
}, },
/** /**