about summary refs log tree commit diff
path: root/app/javascript
diff options
context:
space:
mode:
authornullkal <nullkal@nil.nu>2017-10-27 23:11:30 +0900
committerEugen Rochko <eugen@zeonfederated.com>2017-10-27 16:11:30 +0200
commit781105293cf129c84ef0b91ec8cd27b7127cf951 (patch)
tree719dbf46e7aa62a8fc552f3c1f91d4a6b3e0e658 /app/javascript
parent0cb329f63a292598ef9ed1af6b8f8b56658e7984 (diff)
Feature: Unlisted custom emojis (#5485)
Diffstat (limited to 'app/javascript')
-rw-r--r--app/javascript/mastodon/features/compose/containers/emoji_picker_dropdown_container.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/mastodon/features/compose/containers/emoji_picker_dropdown_container.js b/app/javascript/mastodon/features/compose/containers/emoji_picker_dropdown_container.js
index 71944128c..699687c69 100644
--- a/app/javascript/mastodon/features/compose/containers/emoji_picker_dropdown_container.js
+++ b/app/javascript/mastodon/features/compose/containers/emoji_picker_dropdown_container.js
@@ -46,7 +46,7 @@ const getFrequentlyUsedEmojis = createSelector([
 
 const getCustomEmojis = createSelector([
   state => state.get('custom_emojis'),
-], emojis => emojis.sort((a, b) => {
+], emojis => emojis.filter(e => e.get('visible_in_picker')).sort((a, b) => {
   const aShort = a.get('shortcode').toLowerCase();
   const bShort = b.get('shortcode').toLowerCase();