Merge remote-tracking branch 'upstream/develop' into maths-parsing-latex

This commit is contained in:
Sven Mäder 2021-04-06 12:34:51 +02:00
commit 3c1169c7a2
654 changed files with 36969 additions and 10283 deletions

View file

@ -34,6 +34,10 @@ export function mdSerialize(model: EditorModel) {
case "at-room-pill":
return html + part.text;
case "room-pill":
// Here we use the resourceId for compatibility with non-rich text clients
// See https://github.com/vector-im/element-web/issues/16660
return html +
`[${part.resourceId.replace(/[[\\\]]/g, c => "\\" + c)}](${makeGenericPermalink(part.resourceId)})`;
case "user-pill":
return html +
`[${part.text.replace(/[[\\\]]/g, c => "\\" + c)}](${makeGenericPermalink(part.resourceId)})`;
@ -156,6 +160,9 @@ export function textSerialize(model: EditorModel) {
case "at-room-pill":
return text + part.text;
case "room-pill":
// Here we use the resourceId for compatibility with non-rich text clients
// See https://github.com/vector-im/element-web/issues/16660
return text + `${part.resourceId}`;
case "user-pill":
return text + `${part.text}`;
}