diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2016-03-24 10:36:42 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2016-03-24 10:36:42 -0400 |
| commit | e5c2915e87d7bdba1d3d76143a375b9a76985960 (patch) | |
| tree | 39b692144b84c2b052c2d3ee490c1a795ea456a2 /webapp/components/post_body.jsx | |
| parent | 1ce18f7a9afbd8b192e05e7bc8f914430feacc4b (diff) | |
| parent | 5cfae469a5a53c7b8a58858f3704eadd1f66e332 (diff) | |
| download | chat-e5c2915e87d7bdba1d3d76143a375b9a76985960.tar.gz chat-e5c2915e87d7bdba1d3d76143a375b9a76985960.tar.bz2 chat-e5c2915e87d7bdba1d3d76143a375b9a76985960.zip | |
Merge pull request #2523 from hmhealey/plt2351
PLT-2351 Switch to Apple emoji set
Diffstat (limited to 'webapp/components/post_body.jsx')
| -rw-r--r-- | webapp/components/post_body.jsx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/webapp/components/post_body.jsx b/webapp/components/post_body.jsx index cb682abba..884dbbbbb 100644 --- a/webapp/components/post_body.jsx +++ b/webapp/components/post_body.jsx @@ -5,7 +5,6 @@ import ReactDOM from 'react-dom'; import FileAttachmentList from './file_attachment_list.jsx'; import UserStore from 'stores/user_store.jsx'; import * as Utils from 'utils/utils.jsx'; -import * as Emoji from 'utils/emoticons.jsx'; import Constants from 'utils/constants.jsx'; import * as TextFormatting from 'utils/text_formatting.jsx'; import twemoji from 'twemoji'; @@ -52,9 +51,9 @@ class PostBody extends React.Component { parseEmojis() { twemoji.parse(ReactDOM.findDOMNode(this), { - className: 'emoji twemoji', + className: 'emoticon', base: '', - folder: Emoji.getImagePathForEmoticon() + folder: Constants.EMOJI_PATH }); } |