Fix name clash on unicode and custom emoji

This commit is contained in:
eal 2018-02-01 18:12:23 +02:00
parent b67c506062
commit 90175a1872
1 changed files with 1 additions and 1 deletions

View File

@ -136,7 +136,7 @@ window.fetch('/api/pleroma/emoji.json')
const emoji = Object.keys(values).map((key) => { const emoji = Object.keys(values).map((key) => {
return { shortcode: key, image_url: values[key] } return { shortcode: key, image_url: values[key] }
}) })
store.dispatch('setOption', { name: 'emoji', value: emoji }) store.dispatch('setOption', { name: 'customEmoji', value: emoji })
}, },
(failure) => {} (failure) => {}
), ),