diff options
| author | Florian Orben <florian.orben@gmail.com> | 2015-12-01 22:40:24 +0100 |
|---|---|---|
| committer | Florian Orben <florian.orben@gmail.com> | 2015-12-01 22:41:06 +0100 |
| commit | 8a39d160f6e0c0626181279163c95ac88f01e0c5 (patch) | |
| tree | 05e82a243dcd82893c9950c0eead1835f703a465 /web/react/components/rhs_root_post.jsx | |
| parent | c111777f85fc93ab18c6e28473e70c9ed2810683 (diff) | |
| download | chat-8a39d160f6e0c0626181279163c95ac88f01e0c5.tar.gz chat-8a39d160f6e0c0626181279163c95ac88f01e0c5.tar.bz2 chat-8a39d160f6e0c0626181279163c95ac88f01e0c5.zip | |
switch to only use emoji one smileys; remove setting to switch
Diffstat (limited to 'web/react/components/rhs_root_post.jsx')
| -rw-r--r-- | web/react/components/rhs_root_post.jsx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/web/react/components/rhs_root_post.jsx b/web/react/components/rhs_root_post.jsx index 8a9ca2009..0dd969ad0 100644 --- a/web/react/components/rhs_root_post.jsx +++ b/web/react/components/rhs_root_post.jsx @@ -6,6 +6,7 @@ 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 PostBodyAdditionalContent from './post_body_additional_content.jsx'; @@ -23,7 +24,7 @@ export default class RhsRootPost extends React.Component { twemoji.parse(ReactDOM.findDOMNode(this), { className: 'emoji twemoji', base: '', - folder: utils.getImagePathForEmoticon() + folder: Emoji.getImagePathForEmoticon() }); } componentDidMount() { |