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/rhs_comment.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/rhs_comment.jsx')
| -rw-r--r-- | webapp/components/rhs_comment.jsx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/webapp/components/rhs_comment.jsx b/webapp/components/rhs_comment.jsx index de99eb37d..53170ee15 100644 --- a/webapp/components/rhs_comment.jsx +++ b/webapp/components/rhs_comment.jsx @@ -70,7 +70,11 @@ class RhsComment extends React.Component { this.forceUpdate(); } parseEmojis() { - twemoji.parse(ReactDOM.findDOMNode(this), {size: Constants.EMOJI_SIZE}); + twemoji.parse(ReactDOM.findDOMNode(this), { + className: 'emoticon', + base: '', + folder: Constants.EMOJI_PATH + }); } handlePermalink(e) { e.preventDefault(); |