mirror of
https://akkoma.dev/AkkomaGang/akkoma-fe.git
synced 2024-11-09 18:19:10 +00:00
Merge branch 'fix/field-name-emoji-parsing' into 'develop'
fix #999 emoji not working in profile field names Closes #999 See merge request pleroma/pleroma-fe!1284
This commit is contained in:
commit
563377b59c
3 changed files with 5 additions and 5 deletions
|
@ -8,6 +8,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
|
||||||
### Fixed
|
### Fixed
|
||||||
- Fixed regression in react popup alignment and overflowing
|
- Fixed regression in react popup alignment and overflowing
|
||||||
- Fixed the occasional bug where screen would scroll 1px when typing into a reply form
|
- Fixed the occasional bug where screen would scroll 1px when typing into a reply form
|
||||||
|
- Fixed custom emoji not working in profile field names
|
||||||
|
|
||||||
|
|
||||||
## [2.2.0] - 2020-11-06
|
## [2.2.0] - 2020-11-06
|
||||||
|
|
|
@ -20,14 +20,13 @@
|
||||||
:key="index"
|
:key="index"
|
||||||
class="user-profile-field"
|
class="user-profile-field"
|
||||||
>
|
>
|
||||||
|
<!-- eslint-disable vue/no-v-html -->
|
||||||
<dt
|
<dt
|
||||||
:title="user.fields_text[index].name"
|
:title="user.fields_text[index].name"
|
||||||
class="user-profile-field-name"
|
class="user-profile-field-name"
|
||||||
@click.prevent="linkClicked"
|
@click.prevent="linkClicked"
|
||||||
>
|
v-html="field.name"
|
||||||
{{ field.name }}
|
/>
|
||||||
</dt>
|
|
||||||
<!-- eslint-disable vue/no-v-html -->
|
|
||||||
<dd
|
<dd
|
||||||
:title="user.fields_text[index].value"
|
:title="user.fields_text[index].value"
|
||||||
class="user-profile-field-value"
|
class="user-profile-field-value"
|
||||||
|
|
|
@ -53,7 +53,7 @@ export const parseUser = (data) => {
|
||||||
output.fields = data.fields
|
output.fields = data.fields
|
||||||
output.fields_html = data.fields.map(field => {
|
output.fields_html = data.fields.map(field => {
|
||||||
return {
|
return {
|
||||||
name: addEmojis(field.name, data.emojis),
|
name: addEmojis(escape(field.name), data.emojis),
|
||||||
value: addEmojis(field.value, data.emojis)
|
value: addEmojis(field.value, data.emojis)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
Loading…
Reference in a new issue