aboutsummaryrefslogtreecommitdiff
path: root/src/components/emoji_picker/emoji_picker.js
diff options
context:
space:
mode:
authorHJ <30-hj@users.noreply.git.pleroma.social>2019-10-29 07:41:29 +0000
committerHJ <30-hj@users.noreply.git.pleroma.social>2019-10-29 07:41:29 +0000
commit21989c673ee3690f17ed3095e9fbc51501791c02 (patch)
treede26f9a87bcaa6d8e576cf33165247f5c66b61af /src/components/emoji_picker/emoji_picker.js
parent42f428d90e87315107dd20975548a5bd63dc2d53 (diff)
parentb66564a30dfadfdd2b216072931576c6c4dcbd61 (diff)
Merge branch 'settings-refactor' into 'develop'
Settings refactor See merge request pleroma/pleroma-fe!960
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) {