Skip to content

[stable25] Fix hard line breaks displayed with additional new line between #3416

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mejo- merged 5 commits into from
Nov 13, 2022
Merged

[stable25] Fix hard line breaks displayed with additional new line between #3416

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bb56935
tests: Move table unittest to nodes directory
susnux Nov 10, 2022
df019d9
Fix hard line breaks displayed with additional new line between
susnux Nov 8, 2022
6c8e01a
Added test for rendering of hard breaks within the editor
susnux Nov 10, 2022
8675333
Fix backport issues: Add missing commonmark normalization
susnux Nov 13, 2022
8128f96
Compile assets
nextcloud-command Nov 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix hard line breaks displayed with additional new line between 
To preserve softbreaks within md files we preserve all whitespaces,
so we must not introduce additional new lines after `<br>` elements.

Signed-off-by: Ferdinand Thiessen <[email protected]>
  • Loading branch information
@susnux @juliusknorr
susnux authored and juliusknorr committed Nov 11, 2022
commit df019d9d651024b6c655ba36abc03e9c29ef159a
3 changes: 3 additions & 0 deletions src/markdownit/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,7 @@ const markdownit = MarkdownIt('commonmark', { html: false, breaks: false })
.use(keepSyntax)
.use(markdownitMentions)

// Issue #3370: To preserve softbreaks within md files we preserve all whitespaces, so we must not introduce additional new lines after a <br> element
markdownit.renderer.rules.hardbreak = (tokens, idx, options) => (options.xhtmlOut ? '<br />' : '<br>')

export default markdownit