diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-08-12 10:44:39 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-08-12 10:44:39 +0000 |
| commit | eeddceee6baa90c166cfafe2e9759f82d88017b2 (patch) | |
| tree | 8fa6fcfb38048f31607e5003a9e2a0121550a121 /src/components | |
| parent | 01c5bae5948b69fa646284c711803fcb21772834 (diff) | |
| parent | d5efa10946239dc1c9e0aa646dc1238a2737c456 (diff) | |
Merge branch 'fixRelativeEmojis' into 'develop'
Fixes broken custom emoji in autocomplete when proxying to remote BE
See merge request pleroma/pleroma-fe!300
Diffstat (limited to 'src/components')
| -rw-r--r-- | src/components/post_status_form/post_status_form.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js index 4f4c6aca..34c02325 100644 --- a/src/components/post_status_form/post_status_form.js +++ b/src/components/post_status_form/post_status_form.js @@ -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 { |