diff options
| author | David Yip <yipdw@member.fsf.org> | 2017-10-27 09:45:25 -0500 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2017-10-27 09:45:25 -0500 |
| commit | 870d71b78be74b7fab4892a79a87aff39b1e2726 (patch) | |
| tree | 0628116973b67c573509f8affe50cc3d6c9a6f4f /app/javascript | |
| parent | 656f5b6f87f2dcb80644edbedc4d2330eb5bee8d (diff) | |
| parent | 781105293cf129c84ef0b91ec8cd27b7127cf951 (diff) | |
Merge branch 'master' into gs-master
Diffstat (limited to 'app/javascript')
| -rw-r--r-- | app/javascript/mastodon/features/compose/containers/emoji_picker_dropdown_container.js | 2 |
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(); |