usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix #4034 (#4037) 

* Fix #4034

* improve
This commit is contained in:
MeiMei 2019-01-29 20:33:28 +09:00 committed by syuilo
parent 2ed9e26a4f
commit b0e00da2f7
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mfm/html.ts
View File

@ -157,7 +157,7 @@ export default (tokens: MfmForest, mentionedRemoteUsers: INote['mentionedRemoteU
text(token) { text(token) {
const el = doc.createElement('span'); const el = doc.createElement('span');
const nodes = (token.node.props.text as string).split('\n').map(x => doc.createTextNode(x)); const nodes = (token.node.props.text as string).split(/\r\n|\r|\n/).map(x => doc.createTextNode(x));
for (const x of intersperse('br', nodes)) { for (const x of intersperse('br', nodes)) {
el.appendChild(x === 'br' ? doc.createElement('br') : x); el.appendChild(x === 'br' ? doc.createElement('br') : x);

6
test/mfm.ts
View File

@ -1096,6 +1096,12 @@ describe('MFM', () => {
const output = '<p><span>foo<br>bar<br>baz</span></p>'; const output = '<p><span>foo<br>bar<br>baz</span></p>';
assert.equal(toHtml(analyze(input)), output); assert.equal(toHtml(analyze(input)), output);
}); });
it('br alt', () => {
const input = 'foo\r\nbar\rbaz';
const output = '<p><span>foo<br>bar<br>baz</span></p>';
assert.equal(toHtml(analyze(input)), output);
});
}); });
it('code block with quote', () => { it('code block with quote', () => {