From 3505e53756562b4d7b304d0da9910c4528b25959 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Thu, 12 Sep 2019 20:36:43 +0300 Subject: review/naming + bugfix for stickers --- src/components/emoji_picker/emoji_picker.js | 5 ++++- src/components/emoji_picker/emoji_picker.vue | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'src/components/emoji_picker') diff --git a/src/components/emoji_picker/emoji_picker.js b/src/components/emoji_picker/emoji_picker.js index bce5026e..570ace13 100644 --- a/src/components/emoji_picker/emoji_picker.js +++ b/src/components/emoji_picker/emoji_picker.js @@ -5,7 +5,7 @@ const filterByKeyword = (list, keyword = '') => { const EmojiPicker = { props: { - stickerPicker: { + enableStickerPicker: { required: false, type: Boolean, default: false @@ -97,6 +97,9 @@ const EmojiPicker = { }, emojisView () { return this.emojis.filter(value => value.emojis.length > 0) + }, + stickerPickerEnabled () { + return (this.$store.state.instance.stickers || []).length !== 0 } } } diff --git a/src/components/emoji_picker/emoji_picker.vue b/src/components/emoji_picker/emoji_picker.vue index 901520aa..5c139d0e 100644 --- a/src/components/emoji_picker/emoji_picker.vue +++ b/src/components/emoji_picker/emoji_picker.vue @@ -17,7 +17,7 @@