diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2020-11-11 10:15:29 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2020-11-11 10:15:29 +0000 |
| commit | 563377b59c37008147a0512dc52a4c4859ea828d (patch) | |
| tree | 4bd09a9f4caf989ee697babd239f557059ff5639 | |
| parent | e6ca489d302fe4d1e9379067bbf1bbb02ed3e87b (diff) | |
| parent | b536c6e3c59c9e43beca288c4e581534230afadb (diff) | |
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
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | src/components/user_profile/user_profile.vue | 7 | ||||
| -rw-r--r-- | src/services/entity_normalizer/entity_normalizer.service.js | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 8f14bc59..bf9898a2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### Fixed - Fixed regression in react popup alignment and overflowing - 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 diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue index f1f51840..745e795d 100644 --- a/src/components/user_profile/user_profile.vue +++ b/src/components/user_profile/user_profile.vue @@ -20,14 +20,13 @@ :key="index" class="user-profile-field" > + <!-- eslint-disable vue/no-v-html --> <dt :title="user.fields_text[index].name" class="user-profile-field-name" @click.prevent="linkClicked" - > - {{ field.name }} - </dt> - <!-- eslint-disable vue/no-v-html --> + v-html="field.name" + /> <dd :title="user.fields_text[index].value" class="user-profile-field-value" diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js index 9d09b8d0..a4c1a1bf 100644 --- a/src/services/entity_normalizer/entity_normalizer.service.js +++ b/src/services/entity_normalizer/entity_normalizer.service.js @@ -53,7 +53,7 @@ export const parseUser = (data) => { output.fields = data.fields output.fields_html = data.fields.map(field => { return { - name: addEmojis(field.name, data.emojis), + name: addEmojis(escape(field.name), data.emojis), value: addEmojis(field.value, data.emojis) } }) |