Skip to content
Snippets Groups Projects
Commit eeddceee authored by lain's avatar lain
Browse files

Merge branch 'fixRelativeEmojis' into 'develop'

Fixes broken custom emoji in autocomplete when proxying to remote BE

See merge request pleroma/pleroma-fe!300
parents 01c5bae5 d5efa109
Branches
No related tags found
No related merge requests found
......@@ -87,11 +87,11 @@ const PostStatusForm = {
return false
}
return map(take(matchedEmoji, 5), ({shortcode, image_url, utf}, index) => ({
// eslint-disable-next-line camelcase
screen_name: `:${shortcode}:`,
name: '',
utf: utf || '',
img: image_url,
// eslint-disable-next-line camelcase
img: utf ? '' : this.$store.state.config.server + image_url,
highlighted: index === this.highlighted
}))
} else {
......
......@@ -79,11 +79,12 @@ const i18n = new VueI18n({
window.fetch('/api/statusnet/config.json')
.then((res) => res.json())
.then((data) => {
const {name, closed: registrationClosed, textlimit} = data.site
const {name, closed: registrationClosed, textlimit, server} = data.site
store.dispatch('setOption', { name: 'name', value: name })
store.dispatch('setOption', { name: 'registrationOpen', value: (registrationClosed === '0') })
store.dispatch('setOption', { name: 'textlimit', value: parseInt(textlimit) })
store.dispatch('setOption', { name: 'server', value: server })
})
window.fetch('/static/config.json')
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment