diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2017-07-14 19:47:53 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-07-14 19:47:53 +0200 |
commit | e2685ccc81f04e1a63a97af80686bf85027418a6 (patch) | |
tree | 20e9847c734a11f7a80d31eb8104bc84bbffa9a1 /app/javascript/mastodon/reducers/compose.js | |
parent | c42092ba7ad1cbf78ca8463b6525ec2b7efbdd92 (diff) |
Fix #4149, fix #1199 - Store emojis as unicode (#4189)
- Use unicode when selecting emoji through picker - Convert shortcodes to unicode when storing text input server-side - Do not convert shortcodes in JS anymore
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 a92b5aa23..ea3b78b67 100644 --- a/app/javascript/mastodon/reducers/compose.js +++ b/app/javascript/mastodon/reducers/compose.js @@ -118,7 +118,7 @@ const insertSuggestion = (state, position, token, completion) => { }; const insertEmoji = (state, position, emojiData) => { - const emoji = emojiData.shortname; + const emoji = String.fromCodePoint(parseInt(emojiData.unicode, 16)); return state.withMutations(map => { map.update('text', oldText => `${oldText.slice(0, position)}${emoji} ${oldText.slice(position)}`); |