diff options
author | David Yip <yipdw@member.fsf.org> | 2018-06-12 17:43:50 -0500 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2018-06-12 17:43:50 -0500 |
commit | fac6e392e9d76e3cca44ce142690a59afc0a9156 (patch) | |
tree | 490c6054260f4a75fb0467f343124746c1935970 /app/javascript/flavours/glitch/util/emoji/emoji_mart_search_light.js | |
parent | 4d8d1fa129b5f8692311de211203bc18c614951f (diff) |
Port emojimart 2.6.1 changes to glitch flavour
See also the following commits: - 0c3ce41031d292734e0e4cc70d227228d1993bea - 268d90e8103770e8b90f6d5680a466c1ec83c6ff
Diffstat (limited to 'app/javascript/flavours/glitch/util/emoji/emoji_mart_search_light.js')
-rw-r--r-- | app/javascript/flavours/glitch/util/emoji/emoji_mart_search_light.js | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/app/javascript/flavours/glitch/util/emoji/emoji_mart_search_light.js b/app/javascript/flavours/glitch/util/emoji/emoji_mart_search_light.js index 5755bf1c4..bf511d290 100644 --- a/app/javascript/flavours/glitch/util/emoji/emoji_mart_search_light.js +++ b/app/javascript/flavours/glitch/util/emoji/emoji_mart_search_light.js @@ -8,6 +8,7 @@ let originalPool = {}; let index = {}; let emojisList = {}; let emoticonsList = {}; +let customEmojisList = []; for (let emoji in data.emojis) { let emojiData = data.emojis[emoji]; @@ -28,7 +29,18 @@ for (let emoji in data.emojis) { originalPool[id] = emojiData; } +function clearCustomEmojis(pool) { + customEmojisList.forEach((emoji) => { + let emojiId = emoji.id || emoji.short_names[0]; + + delete pool[emojiId]; + delete emojisList[emojiId]; + }); +} + function addCustomToPool(custom, pool) { + if (customEmojisList.length) clearCustomEmojis(pool); + custom.forEach((emoji) => { let emojiId = emoji.id || emoji.short_names[0]; @@ -37,10 +49,14 @@ function addCustomToPool(custom, pool) { emojisList[emojiId] = getSanitizedData(emoji); } }); + + customEmojisList = custom; + index = {}; } function search(value, { emojisToShowFilter, maxResults, include, exclude, custom = [] } = {}) { - addCustomToPool(custom, originalPool); + if (customEmojisList !== custom) + addCustomToPool(custom, originalPool); maxResults = maxResults || 75; include = include || []; @@ -143,7 +159,7 @@ function search(value, { emojisToShowFilter, maxResults, include, exclude, custo if (results) { if (emojisToShowFilter) { - results = results.filter((result) => emojisToShowFilter(data.emojis[result.id].unified)); + results = results.filter((result) => emojisToShowFilter(data.emojis[result.id])); } if (results && results.length > maxResults) { |