aboutsummaryrefslogtreecommitdiff
path: root/src/components/user_profile/user_profile.vue
diff options
context:
space:
mode:
authorShpuld Shpludson <shp@cock.li>2022-01-09 18:37:01 +0000
committerShpuld Shpludson <shp@cock.li>2022-01-09 18:37:01 +0000
commitb13d8f7e6339e877a38a28008630dc8ec64abcdf (patch)
tree56e2103fcb52640a17847cb97a726f9d6d3198ee /src/components/user_profile/user_profile.vue
parent51d3d8d255de221f7ac99e41f2f8e56c7d6a21a9 (diff)
parent756f7bf7c2ee1beb7b43227271942130fd03c7cb (diff)
Merge branch 'develop' into 'master'
Update MASTER for 2.4.2 See merge request pleroma/pleroma-fe!1421
Diffstat (limited to 'src/components/user_profile/user_profile.vue')
-rw-r--r--src/components/user_profile/user_profile.vue20
1 files changed, 12 insertions, 8 deletions
diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index aef897ae..726216ff 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -20,20 +20,24 @@
: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"
- v-html="field.name"
- />
+ >
+ <RichContent
+ :html="field.name"
+ :emoji="user.emoji"
+ />
+ </dt>
<dd
:title="user.fields_text[index].value"
class="user-profile-field-value"
- @click.prevent="linkClicked"
- v-html="field.value"
- />
- <!-- eslint-enable vue/no-v-html -->
+ >
+ <RichContent
+ :html="field.value"
+ :emoji="user.emoji"
+ />
+ </dd>
</dl>
</div>
<tab-switcher