PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

fix bug detected by tests

Browse source
This commit is contained in:
Bruno Windels 2019-08-22 14:41:40 +01:00
parent 1dd052d9dd
commit 5cebce9bbf
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/editor/deserialize.js
View file

@ -223,14 +223,14 @@ function parseHtmlMessage(html, partCreator, isQuotedMessage) {
function parsePlainTextMessage(body, partCreator, isQuotedMessage) { function parsePlainTextMessage(body, partCreator, isQuotedMessage) {
const lines = body.split("\n"); const lines = body.split("\n");
const parts = lines.reduce((parts, line, i) => { const parts = lines.reduce((parts, line, i) => {
const isLast = i === lines.length - 1;
if (!isLast) {
parts.push(partCreator.newline());
}
if (isQuotedMessage) { if (isQuotedMessage) {
parts.push(partCreator.plain(QUOTE_LINE_PREFIX)); parts.push(partCreator.plain(QUOTE_LINE_PREFIX));
} }
parts.push(...parseAtRoomMentions(line, partCreator)); parts.push(...parseAtRoomMentions(line, partCreator));
const isLast = i === lines.length - 1;
if (!isLast) {
parts.push(partCreator.newline());
}
return parts; return parts;
}, []); }, []);
return parts; return parts;

2
test/editor/deserialize-test.js
View file

@ -71,10 +71,10 @@ describe('editor/deserialize', function() {
describe('text messages', function() { describe('text messages', function() {
it('test with newlines', function() { it('test with newlines', function() {
const parts = normalize(parseEvent(textMessage("hello\nworld"), createPartCreator())); const parts = normalize(parseEvent(textMessage("hello\nworld"), createPartCreator()));
expect(parts.length).toBe(3);
expect(parts[0]).toStrictEqual({type: "plain", text: "hello"}); expect(parts[0]).toStrictEqual({type: "plain", text: "hello"});
expect(parts[1]).toStrictEqual({type: "newline", text: "\n"}); expect(parts[1]).toStrictEqual({type: "newline", text: "\n"});
expect(parts[2]).toStrictEqual({type: "plain", text: "world"}); expect(parts[2]).toStrictEqual({type: "plain", text: "world"});
expect(parts.length).toBe(3);
}); });
it('@room pill', function() { it('@room pill', function() {
const parts = normalize(parseEvent(textMessage("text message for @room"), createPartCreator())); const parts = normalize(parseEvent(textMessage("text message for @room"), createPartCreator()));