diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2024-01-17 13:23:33 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2024-01-17 13:23:33 +0000 |
| commit | b0d0a3faf64fa5570ff67c254179350be3ebce47 (patch) | |
| tree | 71c39af60f8f746fed56b84679bdf82421a7298c /src/components/emoji_picker/emoji_picker.vue | |
| parent | ae4e360157234a352f71c90e84b9861ee572472e (diff) | |
| parent | 88a006eb1afeb6cad26daffa428baf706210f008 (diff) | |
Merge branch 'upstream-hide-custom-emoji' into 'develop'
Add ability to hide custom emojis in picker
See merge request pleroma/pleroma-fe!1887
Diffstat (limited to 'src/components/emoji_picker/emoji_picker.vue')
| -rw-r--r-- | src/components/emoji_picker/emoji_picker.vue | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/components/emoji_picker/emoji_picker.vue b/src/components/emoji_picker/emoji_picker.vue index 0788f34c..1231ce2b 100644 --- a/src/components/emoji_picker/emoji_picker.vue +++ b/src/components/emoji_picker/emoji_picker.vue @@ -142,6 +142,17 @@ {{ $t('emoji.keep_open') }} </Checkbox> </div> + <div + v-if="!hideCustomEmoji" + class="hide-custom-emoji" + > + <Checkbox + v-model="hideCustomEmojiInPicker" + @change="onShowing" + > + {{ $t('emoji.hide_custom_emoji') }} + </Checkbox> + </div> </div> <div v-if="showingStickers" |