scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-23 07:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Use EmojiText component to allow emoji display when API includes them

Browse source
This commit is contained in:
Paul Kaplan 2018-10-18 10:18:00 -04:00
parent d982d2d723
commit 1d3c3ff431
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/views/preview/comment/comment.jsx
View file

@ -5,6 +5,7 @@ const classNames = require('classnames');
const FlexRow = require('../../../components/flex-row/flex-row.jsx'); const FlexRow = require('../../../components/flex-row/flex-row.jsx');
const Avatar = require('../../../components/avatar/avatar.jsx'); const Avatar = require('../../../components/avatar/avatar.jsx');
const EmojiText = require('../../../components/emoji-text/emoji-text.jsx');
const FormattedRelative = require('react-intl').FormattedRelative; const FormattedRelative = require('react-intl').FormattedRelative;
const FormattedMessage = require('react-intl').FormattedMessage; const FormattedMessage = require('react-intl').FormattedMessage;
const ComposeComment = require('./compose-comment.jsx'); const ComposeComment = require('./compose-comment.jsx');
@ -166,7 +167,10 @@ class Comment extends React.Component {
{replyUsername && ( {replyUsername && (
<a href={`/users/${replyUsername}`}>@{replyUsername}&nbsp;</a> <a href={`/users/${replyUsername}`}>@{replyUsername}&nbsp;</a>
)} )}
{content} <EmojiText
as="span"
text={content}
/>
</span> </span>
<FlexRow className="comment-bottom-row"> <FlexRow className="comment-bottom-row">
<span className="comment-time"> <span className="comment-time">