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/reducers/compose.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/reducers/compose.js')
| -rw-r--r-- | app/javascript/mastodon/reducers/compose.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/mastodon/reducers/compose.js b/app/javascript/mastodon/reducers/compose.js index 34f5dab7f..526dbd0c5 100644 --- a/app/javascript/mastodon/reducers/compose.js +++ b/app/javascript/mastodon/reducers/compose.js @@ -120,7 +120,7 @@ const insertSuggestion = (state, position, token, completion) => { }; const insertEmoji = (state, position, emojiData) => { - const emoji = emojiData.unicode.split('-').map(code => String.fromCodePoint(parseInt(code, 16))).join(''); + const emoji = emojiData.native; return state.withMutations(map => { map.update('text', oldText => `${oldText.slice(0, position)}${emoji} ${oldText.slice(position)}`); |