Merge branch 'fixRelativeEmojis' into 'develop'

Fixes broken custom emoji in autocomplete when proxying to remote BE

See merge request pleroma/pleroma-fe!300
This commit is contained in:
lambda 2018-08-12 10:44:39 +00:00
commit eeddceee6b
2 changed files with 4 additions and 3 deletions

View file

@ -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 {