diff options
| author | Henry Jameson <me@hjkos.com> | 2018-08-06 09:45:22 +0300 |
|---|---|---|
| committer | Henry Jameson <me@hjkos.com> | 2018-08-06 09:45:22 +0300 |
| commit | 976444064f19fbfc1a4085b421196f36d690d820 (patch) | |
| tree | 8999e19fef1aa96b4cf37f21fe79a3d3a05ff6ad /src | |
| parent | 32fd108e97de8a1e1201bcc31f70af9ace77e517 (diff) | |
Fixes broken custom emoji in autocomplete when proxying to remote BE
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/post_status_form/post_status_form.js | 2 | ||||
| -rw-r--r-- | src/main.js | 3 |
2 files changed, 3 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..aa9cd160 100644 --- a/src/components/post_status_form/post_status_form.js +++ b/src/components/post_status_form/post_status_form.js @@ -91,7 +91,7 @@ const PostStatusForm = { screen_name: `:${shortcode}:`, name: '', utf: utf || '', - img: image_url, + img: utf ? '' : this.$store.state.config.server + image_url, highlighted: index === this.highlighted })) } else { diff --git a/src/main.js b/src/main.js index bacd7f6d..fa955063 100644 --- a/src/main.js +++ b/src/main.js @@ -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') |