diff options
author | Christopher Speller <crspeller@gmail.com> | 2015-12-03 08:18:33 -0500 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2015-12-03 08:18:33 -0500 |
commit | eddd4e0fc49582cf7f484168f5e2c08b0ac89596 (patch) | |
tree | db02a3aab3bd0ead440f4b49a4224679ae9bd1ed /web/react/components/rhs_root_post.jsx | |
parent | b3115b9cb69e9c9aefcd6c82e71c55a9288965d8 (diff) | |
parent | 8a39d160f6e0c0626181279163c95ac88f01e0c5 (diff) | |
download | chat-eddd4e0fc49582cf7f484168f5e2c08b0ac89596.tar.gz chat-eddd4e0fc49582cf7f484168f5e2c08b0ac89596.tar.bz2 chat-eddd4e0fc49582cf7f484168f5e2c08b0ac89596.zip |
Merge pull request #1554 from florianorben/emoji_style
Allow to switch between default and emoji-one emoji style
Diffstat (limited to 'web/react/components/rhs_root_post.jsx')
-rw-r--r-- | web/react/components/rhs_root_post.jsx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/web/react/components/rhs_root_post.jsx b/web/react/components/rhs_root_post.jsx index 3d3d9e13f..0dd969ad0 100644 --- a/web/react/components/rhs_root_post.jsx +++ b/web/react/components/rhs_root_post.jsx @@ -6,9 +6,9 @@ import UserProfile from './user_profile.jsx'; import UserStore from '../stores/user_store.jsx'; import * as TextFormatting from '../utils/text_formatting.jsx'; import * as utils from '../utils/utils.jsx'; +import * as Emoji from '../utils/emoticons.jsx'; import FileAttachmentList from './file_attachment_list.jsx'; import twemoji from 'twemoji'; -import Constants from '../utils/constants.jsx'; import PostBodyAdditionalContent from './post_body_additional_content.jsx'; import * as EventHelpers from '../dispatcher/event_helpers.jsx'; @@ -21,7 +21,11 @@ export default class RhsRootPost extends React.Component { this.state = {}; } parseEmojis() { - twemoji.parse(ReactDOM.findDOMNode(this), {size: Constants.EMOJI_SIZE}); + twemoji.parse(ReactDOM.findDOMNode(this), { + className: 'emoji twemoji', + base: '', + folder: Emoji.getImagePathForEmoticon() + }); } componentDidMount() { this.parseEmojis(); |