aboutsummaryrefslogtreecommitdiff
path: root/src/components/settings/settings.js
diff options
context:
space:
mode:
authorHJ <30-hj@users.noreply.git.pleroma.social>2019-09-26 05:27:59 +0000
committerHJ <30-hj@users.noreply.git.pleroma.social>2019-09-26 05:27:59 +0000
commit501208d350a9bd0fbcafb13d70a2fa6182fb8cf3 (patch)
treebeb8a09c2033d5c3da6dcf49a1fe259e1986c4d0 /src/components/settings/settings.js
parente55645aec16f083e4eedf6b01954b79689c244f1 (diff)
parent836cb817d18f5e3ee6dab446633b8e05733c2a3a (diff)
Merge branch 'emoji-selector-update' into 'develop'
Emoji selector update Closes #101 See merge request pleroma/pleroma-fe!895
Diffstat (limited to 'src/components/settings/settings.js')
-rw-r--r--src/components/settings/settings.js4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/components/settings/settings.js b/src/components/settings/settings.js
index c4aa45b2..b6540d7e 100644
--- a/src/components/settings/settings.js
+++ b/src/components/settings/settings.js
@@ -16,6 +16,7 @@ const settings = {
return {
hideAttachmentsLocal: user.hideAttachments,
+ padEmojiLocal: user.padEmoji,
hideAttachmentsInConvLocal: user.hideAttachmentsInConv,
maxThumbnails: user.maxThumbnails,
hideNsfwLocal: user.hideNsfw,
@@ -127,6 +128,9 @@ const settings = {
hideAttachmentsLocal (value) {
this.$store.dispatch('setOption', { name: 'hideAttachments', value })
},
+ padEmojiLocal (value) {
+ this.$store.dispatch('setOption', { name: 'padEmoji', value })
+ },
hideAttachmentsInConvLocal (value) {
this.$store.dispatch('setOption', { name: 'hideAttachmentsInConv', value })
},