aboutsummaryrefslogtreecommitdiff
path: root/src/components/emoji_picker/emoji_picker.js
diff options
context:
space:
mode:
authorTarteka <info@tarteka.net>2019-10-30 22:17:19 +0100
committerTarteka <info@tarteka.net>2019-10-30 22:17:19 +0100
commitfe4845a7c1ca9d6fa51132a0ef9bc5103facae66 (patch)
tree92aceb88e58d149a5446e5a9d7bca6084cb6fa99 /src/components/emoji_picker/emoji_picker.js
parenta178346f1e0fbe2246532bbfeba5fd1cc0c1cb2d (diff)
parent74f5f168d639e9e21e294ac45dd6091694a041cc (diff)
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into develop
Diffstat (limited to 'src/components/emoji_picker/emoji_picker.js')
-rw-r--r--src/components/emoji_picker/emoji_picker.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/components/emoji_picker/emoji_picker.js b/src/components/emoji_picker/emoji_picker.js
index 824412dd..b1d70176 100644
--- a/src/components/emoji_picker/emoji_picker.js
+++ b/src/components/emoji_picker/emoji_picker.js
@@ -1,3 +1,4 @@
+import Checkbox from '../checkbox/checkbox.vue'
const filterByKeyword = (list, keyword = '') => {
return list.filter(x => x.displayText.includes(keyword))
@@ -13,7 +14,6 @@ const EmojiPicker = {
},
data () {
return {
- labelKey: String(Math.random() * 100000),
keyword: '',
activeGroup: 'custom',
showingStickers: false,
@@ -22,7 +22,8 @@ const EmojiPicker = {
}
},
components: {
- StickerPicker: () => import('../sticker_picker/sticker_picker.vue')
+ StickerPicker: () => import('../sticker_picker/sticker_picker.vue'),
+ Checkbox
},
methods: {
onEmoji (emoji) {