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

Merge pull request #3003 from matrix-org/jryans/hide-fallback-emoji 

Remove reacted with text when shortcode missing
pull/21833/head
J. Ryan Stinnett 2019-05-21 15:41:50 +01:00 committed by GitHub
parent ef4fe52d6b 18d444d2e7
commit 2e052c925c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/views/messages/ReactionsRowButtonTooltip.js
View File

@ -46,7 +46,7 @@ export default class ReactionsRowButtonTooltip extends React.PureComponent {
const { name } = room.getMember(reactionEvent.getSender()); const { name } = room.getMember(reactionEvent.getSender());
senders.push(name); senders.push(name);
} }
const shortName = unicodeToShortcode(content) || content; const shortName = unicodeToShortcode(content);
tooltipLabel = <div>{_t( tooltipLabel = <div>{_t(
"<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>", "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>",
{ {
@ -59,6 +59,9 @@ export default class ReactionsRowButtonTooltip extends React.PureComponent {
</div>; </div>;
}, },
reactedWith: (sub) => { reactedWith: (sub) => {
if (!shortName) {
return null;
}
return <div className="mx_ReactionsRowButtonTooltip_reactedWith"> return <div className="mx_ReactionsRowButtonTooltip_reactedWith">
{sub} {sub}
</div>; </div>;