aboutsummaryrefslogtreecommitdiff
path: root/src/main.js
diff options
context:
space:
mode:
authoreal <eal@waifu.club>2018-02-01 18:12:23 +0200
committereal <eal@waifu.club>2018-02-01 18:12:23 +0200
commit90175a1872cace45ae0e410ed283fab25c9e42cd (patch)
treee25dd1c14ff0e0ca79d2b008261f2876ca21ca0d /src/main.js
parentb67c50606250d2c2d4b3750affdbab6525872f2a (diff)
Fix name clash on unicode and custom emoji
Diffstat (limited to 'src/main.js')
-rw-r--r--src/main.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main.js b/src/main.js
index 51e0f7eb..305077b1 100644
--- a/src/main.js
+++ b/src/main.js
@@ -136,7 +136,7 @@ window.fetch('/api/pleroma/emoji.json')
const emoji = Object.keys(values).map((key) => {
return { shortcode: key, image_url: values[key] }
})
- store.dispatch('setOption', { name: 'emoji', value: emoji })
+ store.dispatch('setOption', { name: 'customEmoji', value: emoji })
},
(failure) => {}
),