diff options
| author | Jack <jackdeng@gmail.com> | 2015-09-22 08:16:51 -0700 |
|---|---|---|
| committer | Jack <jackdeng@gmail.com> | 2015-09-22 08:16:51 -0700 |
| commit | 602bed85f2b32733f73e2edddb542fa36baac462 (patch) | |
| tree | 06a6ee9b609a9122bc2f0e6f6e6300f9ba79a3aa /web/react/components/post_body.jsx | |
| parent | a31868336f97a91bfd5a7e91e99a9b294d131f90 (diff) | |
| parent | f439c82d7c885b4c530ba9da0a41b17910743b55 (diff) | |
| download | chat-602bed85f2b32733f73e2edddb542fa36baac462.tar.gz chat-602bed85f2b32733f73e2edddb542fa36baac462.tar.bz2 chat-602bed85f2b32733f73e2edddb542fa36baac462.zip | |
fix conflict
Diffstat (limited to 'web/react/components/post_body.jsx')
| -rw-r--r-- | web/react/components/post_body.jsx | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/web/react/components/post_body.jsx b/web/react/components/post_body.jsx index 3be615bb9..dbbcdc409 100644 --- a/web/react/components/post_body.jsx +++ b/web/react/components/post_body.jsx @@ -35,9 +35,6 @@ export default class PostBody extends React.Component { parseEmojis() { twemoji.parse(React.findDOMNode(this), {size: Constants.EMOJI_SIZE}); - this.getAllChildNodes(React.findDOMNode(this)).forEach((current) => { - global.window.emojify.run(current); - }); } componentDidMount() { @@ -154,17 +151,18 @@ export default class PostBody extends React.Component { return ( <div className='post-body'> {comment} - <p + <div key={`${post.id}_message`} id={`${post.id}_message`} className={postClass} > {loading} <span + ref='message_span' onClick={TextFormatting.handleClick} dangerouslySetInnerHTML={{__html: TextFormatting.formatText(this.state.message)}} /> - </p> + </div> {fileAttachmentHolder} {embed} </div> |