diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2023-03-20 20:31:20 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2023-03-20 20:31:20 +0000 |
| commit | fa532b1f005220743d036b7d103c47a043be7ae4 (patch) | |
| tree | 09d5e4d409f7298a328e3feaac6a062e9082df4d /src/components/emoji_picker/emoji_picker.js | |
| parent | 19618db1929f1aea6183de3102581844298d1d39 (diff) | |
| parent | 493120b5456282756d05d9afaf66b11a2f87d8fc (diff) | |
Merge branch 'pleroma-akkoma-emoji-port' into 'develop'
Custom emoji reaction support
See merge request pleroma/pleroma-fe!1792
Diffstat (limited to 'src/components/emoji_picker/emoji_picker.js')
| -rw-r--r-- | src/components/emoji_picker/emoji_picker.js | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/components/emoji_picker/emoji_picker.js b/src/components/emoji_picker/emoji_picker.js index 0d7ca812..349b043d 100644 --- a/src/components/emoji_picker/emoji_picker.js +++ b/src/components/emoji_picker/emoji_picker.js @@ -98,6 +98,11 @@ const EmojiPicker = { required: false, type: Boolean, default: false + }, + hideCustomEmoji: { + required: false, + type: Boolean, + default: false } }, data () { @@ -280,6 +285,9 @@ const EmojiPicker = { return 0 }, allCustomGroups () { + if (this.hideCustomEmoji) { + return {} + } const emojis = this.$store.getters.groupedCustomEmojis if (emojis.unpacked) { emojis.unpacked.text = this.$t('emoji.unpacked') |