worldcone/cherrypick
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix #2720

Browse source
This commit is contained in:
syuilo 2018-09-17 02:45:30 +09:00
parent 6138a74231
commit 374b276f5c
No known key found for this signature in database
GPG key ID: BDC4C49D06AB9D69
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/mfm/html.ts
View file

@ -82,9 +82,13 @@ const handlers: { [key: string]: (window: any, token: any, mentionedRemoteUsers:
text({ document }, { content }) { text({ document }, { content }) {
const nodes = (content as string).split('\n').map(x => document.createTextNode(x)); const nodes = (content as string).split('\n').map(x => document.createTextNode(x));
for (const x of intersperse(document.createElement('br'), nodes)) { for (const x of intersperse('br', nodes)) {
if (x === 'br') {
document.body.appendChild(document.createElement('br'));
} else {
document.body.appendChild(x); document.body.appendChild(x);
} }
}
}, },
url({ document }, { url }) { url({ document }, { url }) {

9
test/mfm.ts
View file

@ -1,6 +1,7 @@
import * as assert from 'assert'; import * as assert from 'assert';
import analyze from '../src/mfm/parse'; import analyze from '../src/mfm/parse';
import toHtml from '../src/mfm/html';
import syntaxhighlighter from '../src/mfm/parse/core/syntax-highlighter'; import syntaxhighlighter from '../src/mfm/parse/core/syntax-highlighter';
describe('Text', () => { describe('Text', () => {
@ -170,4 +171,12 @@ describe('Text', () => {
assert.equal(html, '<span class="symbol">/</span>'); assert.equal(html, '<span class="symbol">/</span>');
}); });
}); });
describe('toHtml', () => {
it('br', () => {
const input = 'foo\nbar\nbaz';
const output = '<p>foo<br>bar<br>baz</p>';
assert.equal(toHtml(analyze(input)), output);
});
});
}); });