Fix #4034 (#4037)

* Fix #4034 * improve
misskey-dev · Jan 29, 2019 · b0e00da · b0e00da
1 parent 2ed9e26
commit b0e00da
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/mfm/html.ts b/src/mfm/html.ts
@@ -157,7 +157,7 @@ export default (tokens: MfmForest, mentionedRemoteUsers: INote['mentionedRemoteU
 
 		text(token) {
 			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)) {
 				el.appendChild(x === 'br' ? doc.createElement('br') : x);

diff --git a/test/mfm.ts b/test/mfm.ts
@@ -1096,6 +1096,12 @@ describe('MFM', () => {
 			const output = '<p><span>foo<br>bar<br>baz</span></p>';
 			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', () => {