OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

fix ugly formatting

pull/21833/head
Matthew Hodgson 2019-05-19 16:48:15 +01:00
parent c63419f8a2
commit 54cea146e8
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/HtmlUtils.js
View File

@ -455,11 +455,13 @@ export function bodyToHtml(content, highlights, opts={}) {
contentBodyTrimmed = contentBodyTrimmed.replace(ZWJ_REGEX, ''); contentBodyTrimmed = contentBodyTrimmed.replace(ZWJ_REGEX, '');
const match = EMOJI_REGEX.exec(contentBodyTrimmed); const match = EMOJI_REGEX.exec(contentBodyTrimmed);
emojiBody = match && match[0] && match[0].length === contentBodyTrimmed.length emojiBody = match && match[0] && match[0].length === contentBodyTrimmed.length &&
// Prevent user pills expanding for users with only emoji in // Prevent user pills expanding for users with only emoji in
// their username // their username
&& (content.formatted_body == undefined (
|| !content.formatted_body.includes("https://matrix.to/")); content.formatted_body == undefined ||
!content.formatted_body.includes("https://matrix.to/")
);
} }
const className = classNames({ const className = classNames({