diff options
| author | Sorin Davidoi <sorin.davidoi@gmail.com> | 2017-07-17 10:57:45 +0200 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-07-17 10:57:45 +0200 |
| commit | 1d2616b79b6bc5b433092c302967c0ee33bd9845 (patch) | |
| tree | 55d1164ac36dab9f958868dbf9da638fe819c532 /app/javascript/mastodon/reducers/compose.js | |
| parent | d4b097a88cb43105be86ea06fe4a4dd7830b8416 (diff) | |
fix(emojis): Handle multipoint emojis (e.g. country flags) (#4221)
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 ea3b78b67..781e6e11b 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 = String.fromCodePoint(parseInt(emojiData.unicode, 16)); + const emoji = emojiData.unicode.split('-').map(code => String.fromCodePoint(parseInt(code, 16))).join(''); return state.withMutations(map => { map.update('text', oldText => `${oldText.slice(0, position)}${emoji} ${oldText.slice(position)}`); |