ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Port 85470ec872 to glitch emoji picker. 

Fixes #541.
rebase/4.0.0rc2
David Yip 2018-06-15 12:10:45 -05:00 committed by ThibG
parent afceef74c2
commit 8cafeedc25
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/javascript/flavours/glitch/util/emoji/emoji_mart_search_light.js
View File

@ -54,9 +54,13 @@ function addCustomToPool(custom, pool) {
index = {}; index = {};
} }
function search(value, { emojisToShowFilter, maxResults, include, exclude, custom = [] } = {}) { function search(value, { emojisToShowFilter, maxResults, include, exclude, custom } = {}) {
if (customEmojisList !== custom) if (custom !== undefined) {
addCustomToPool(custom, originalPool); if (customEmojisList !== custom)
addCustomToPool(custom, originalPool);
} else {
custom = [];
}
maxResults = maxResults || 75; maxResults = maxResults || 75;
include = include || []; include = include || [];