diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2016-05-09 03:17:26 -0400 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2016-05-09 00:17:26 -0700 |
| commit | 761f59645dfcb55f13570ba0b05cf22c5333b084 (patch) | |
| tree | 0b4e800172f4960c2f52908e1db79d6b20cf2b21 /webapp/components | |
| parent | e8b3e0a7bc0e51df0532280f56d4fd9a97f138cc (diff) | |
| download | chat-761f59645dfcb55f13570ba0b05cf22c5333b084.tar.gz chat-761f59645dfcb55f13570ba0b05cf22c5333b084.tar.bz2 chat-761f59645dfcb55f13570ba0b05cf22c5333b084.zip | |
PLT-2816 Fixed handling of Unicode 8 emojis (#2924)
* Updated twemoji to properly recognize Unicode 8.0 emojis
* Updated unicode emoji parser to only render emojis we support as images
* Corrected filename for South African flag emoji
* Added Mattermost emoticons!
* Added additional emoticons to test files
Diffstat (limited to 'webapp/components')
| -rw-r--r-- | webapp/components/suggestion/emoticon_provider.jsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/webapp/components/suggestion/emoticon_provider.jsx b/webapp/components/suggestion/emoticon_provider.jsx index bbf7c6f51..b7f4cd513 100644 --- a/webapp/components/suggestion/emoticon_provider.jsx +++ b/webapp/components/suggestion/emoticon_provider.jsx @@ -55,7 +55,7 @@ export default class EmoticonProvider { const matched = []; - for (const [name, emoticon] of Emoticons.emoticons) { + for (const [name, emoticon] of Emoticons.getEmoticonsByName()) { if (name.indexOf(partialName) !== -1) { matched.push(emoticon); |