From 761f59645dfcb55f13570ba0b05cf22c5333b084 Mon Sep 17 00:00:00 2001
From: Harrison Healey <harrisonmhealey@gmail.com>
Date: Mon, 9 May 2016 03:17:26 -0400
Subject: 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
---
 webapp/components/suggestion/emoticon_provider.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'webapp/components')

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);
 
-- 
cgit v1.2.3-1-g7c22