diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2021-09-07 16:15:41 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2021-09-07 16:15:41 +0000 |
| commit | 8af1f08539d7c2863107bd3dfd36002b7558e252 (patch) | |
| tree | a50006d11cdf6b834b49c2c98dc192609ba4471a /src/components/basic_user_card/basic_user_card.vue | |
| parent | 25a8b48bf28e1a0e0765f28221c5528f5854656b (diff) | |
| parent | 4d73eaa6cef7a8b81bcca719755b11c05717d395 (diff) | |
Merge branch 'better-still-emoji' into 'develop'
Status HTML parsing - better emoji and mentions rendering
Closes #935
See merge request pleroma/pleroma-fe!1392
Diffstat (limited to 'src/components/basic_user_card/basic_user_card.vue')
| -rw-r--r-- | src/components/basic_user_card/basic_user_card.vue | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/components/basic_user_card/basic_user_card.vue b/src/components/basic_user_card/basic_user_card.vue index c53f6a9c..53deb1df 100644 --- a/src/components/basic_user_card/basic_user_card.vue +++ b/src/components/basic_user_card/basic_user_card.vue @@ -25,17 +25,11 @@ :title="user.name" class="basic-user-card-user-name" > - <!-- eslint-disable vue/no-v-html --> - <span - v-if="user.name_html" + <RichContent class="basic-user-card-user-name-value" - v-html="user.name_html" + :html="user.name" + :emoji="user.emoji" /> - <!-- eslint-enable vue/no-v-html --> - <span - v-else - class="basic-user-card-user-name-value" - >{{ user.name }}</span> </div> <div> <router-link |