aboutsummaryrefslogtreecommitdiff
path: root/src/components/emoji_picker/emoji_picker.js
diff options
context:
space:
mode:
authorHenry Jameson <me@hjkos.com>2024-02-29 18:49:23 +0200
committerHenry Jameson <me@hjkos.com>2024-02-29 18:49:23 +0200
commit54e3a99bc762a1286b0c1a782297d40587b7f14f (patch)
treed4f08471c797c673977b330f358c004094a87c32 /src/components/emoji_picker/emoji_picker.js
parent73f6ecb21e9a705caac0d1ce6b38b3aa75e4345b (diff)
parent90427921336879bd7b5df742a7af41d85dceeee4 (diff)
Merge remote-tracking branch 'origin/develop' into themes3
Diffstat (limited to 'src/components/emoji_picker/emoji_picker.js')
-rw-r--r--src/components/emoji_picker/emoji_picker.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/components/emoji_picker/emoji_picker.js b/src/components/emoji_picker/emoji_picker.js
index 30c01aa5..eb665c40 100644
--- a/src/components/emoji_picker/emoji_picker.js
+++ b/src/components/emoji_picker/emoji_picker.js
@@ -114,6 +114,7 @@ const EmojiPicker = {
groupsScrolledClass: 'scrolled-top',
keepOpen: false,
customEmojiTimeout: null,
+ hideCustomEmojiInPicker: false,
// Lazy-load only after the first time `showing` becomes true.
contentLoaded: false,
groupRefs: {},
@@ -286,7 +287,7 @@ const EmojiPicker = {
return 0
},
allCustomGroups () {
- if (this.hideCustomEmoji) {
+ if (this.hideCustomEmoji || this.hideCustomEmojiInPicker) {
return {}
}
const emojis = this.$store.getters.groupedCustomEmojis