gearheads/mastodon
Archived
2
0
Fork 0
Code Releases 4 Activity

Support emojis in display name, bio

Browse source
This commit is contained in:
Eugen Rochko 2016-11-15 18:38:57 +01:00
parent 4f07fb1f0a
commit 489bd99803
5 changed files with 33 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/assets/javascripts/components/components/status_content.jsx
View file

@ -1,10 +1,6 @@
import ImmutablePropTypes from 'react-immutable-proptypes';
import PureRenderMixin from 'react-addons-pure-render-mixin';
import emojione from 'emojione';
emojione.imageType = 'png';
emojione.sprites = false;
emojione.imagePathPNG = '/emoji/';
import emojify from '../emoji';
const StatusContent = React.createClass({
@ -61,7 +57,7 @@ const StatusContent = React.createClass({
},
render () {
const content = { __html: emojione.unicodeToImage(this.props.status.get('content')) };
const content = { __html: emojify(this.props.status.get('content')) };
return <div className='status__content' style={{ cursor: 'pointer' }} dangerouslySetInnerHTML={content} onClick={this.props.onClick} />;
},