Port 85470ec872 to glitch emoji picker.

Fixes #541.
6 years ago · 8cafeedc25
parent afceef74c2
commit 8cafeedc25
1 changed files with 7 additions and 3 deletions
--- a/app/javascript/flavours/glitch/util/emoji/emoji_mart_search_light.js
+++ b/app/javascript/flavours/glitch/util/emoji/emoji_mart_search_light.js
@ -54,9 +54,13 @@ function addCustomToPool(custom, pool) {
  index = {};
 }

-function search(value, { emojisToShowFilter, maxResults, include, exclude, custom = [] } = {}) {
-  if (customEmojisList !== custom)
-    addCustomToPool(custom, originalPool);
+function search(value, { emojisToShowFilter, maxResults, include, exclude, custom } = {}) {
+  if (custom !== undefined) {
+    if (customEmojisList !== custom)
+      addCustomToPool(custom, originalPool);
+  } else {
+    custom = [];
+  }

  maxResults = maxResults || 75;
  include = include || [];