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

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

Browse source 
Remove reacted with text when shortcode missing
This commit is contained in:
J. Ryan Stinnett 2019-05-21 15:41:50 +01:00 committed by GitHub
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>;