diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-09-23 01:41:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-23 01:41:00 +0200 |
| commit | 846cd4e8381c891816cf814582304b534db4ee5f (patch) | |
| tree | fb7c718bd3071bf5128f6c270901623aab54a0f0 /app/javascript/mastodon/features/compose/components/compose_form.js | |
| parent | 0de82dd316839ed329504bfbf9bd0f2d3d96e654 (diff) | |
Switch from EmojiOne to Twemoji, different emoji picker (#5046)
* Switch from EmojiOne to Twemoji, different emoji picker * Make emoji-mart use a local spritesheet * Fix emojify test * yarn manage:translations
Diffstat (limited to 'app/javascript/mastodon/features/compose/components/compose_form.js')
| -rw-r--r-- | app/javascript/mastodon/features/compose/components/compose_form.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/mastodon/features/compose/components/compose_form.js b/app/javascript/mastodon/features/compose/components/compose_form.js index 413142d81..bb747b611 100644 --- a/app/javascript/mastodon/features/compose/components/compose_form.js +++ b/app/javascript/mastodon/features/compose/components/compose_form.js @@ -138,7 +138,7 @@ export default class ComposeForm extends ImmutablePureComponent { handleEmojiPick = (data) => { const position = this.autosuggestTextarea.textarea.selectionStart; - const emojiChar = data.unicode.split('-').map(code => String.fromCodePoint(parseInt(code, 16))).join(''); + const emojiChar = data.native; this._restoreCaret = position + emojiChar.length + 1; this.props.onPickEmoji(position, data); } |