diff options
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r-- | app/assets/javascripts/components/components/status_content.jsx | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/app/assets/javascripts/components/components/status_content.jsx b/app/assets/javascripts/components/components/status_content.jsx index 67fd9cb69..a6321d31c 100644 --- a/app/assets/javascripts/components/components/status_content.jsx +++ b/app/assets/javascripts/components/components/status_content.jsx @@ -1,5 +1,10 @@ import ImmutablePropTypes from 'react-immutable-proptypes'; -import PureRenderMixin from 'react-addons-pure-render-mixin'; +import PureRenderMixin from 'react-addons-pure-render-mixin'; +import emojione from 'emojione'; + +emojione.imageType = 'png'; +emojione.sprites = false; +emojione.imagePathPNG = '/emoji/'; const StatusContent = React.createClass({ @@ -55,7 +60,7 @@ const StatusContent = React.createClass({ }, render () { - const content = { __html: this.props.status.get('content') }; + const content = { __html: emojione.unicodeToImage(this.props.status.get('content')) }; return <div className='status__content' dangerouslySetInnerHTML={content} />; }, |