OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #3274 from matrix-org/bwindels/fixpostcodeblocknewline 

Fix newline not being appended to code block while converting message to markdown
pull/21833/head
Bruno Windels 2019-08-05 08:19:42 +00:00 committed by GitHub
parent 5f45bbd6b7 c53708b245
commit 98c0232a96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/editor/deserialize.js
View File

@ -192,8 +192,11 @@ function parseHtmlMessage(html, partCreator) {
if (lastNode && lastNode.nodeName === "BLOCKQUOTE") { if (lastNode && lastNode.nodeName === "BLOCKQUOTE") {
parts.push(partCreator.newline()); parts.push(partCreator.newline());
} }
lastNode = null; const decend = checkDecendInto(n);
return checkDecendInto(n); // when not decending (like for PRE), onNodeLeave won't be called to set lastNode
// so do that here.
lastNode = decend ? null : n;
return decend;
} }
function onNodeLeave(n) { function onNodeLeave(n) {