diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-08-12 10:40:57 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-08-12 10:40:57 +0000 |
| commit | 01c5bae5948b69fa646284c711803fcb21772834 (patch) | |
| tree | b49b1e54d0ea253b6d489fcd4ebd6ba6b614d188 /src/components/user_card_content/user_card_content.vue | |
| parent | fba757f595f8a1bc75d3b47a2c0efac56ee106f1 (diff) | |
| parent | 876f7633fe34039c6f25831fa63ecc55d99081ff (diff) | |
Merge branch 'feature/emoji-in-profiles' into 'develop'
Use serverside html rendering in usernames and bios if available.
See merge request pleroma/pleroma-fe!304
Diffstat (limited to 'src/components/user_card_content/user_card_content.vue')
| -rw-r--r-- | src/components/user_card_content/user_card_content.vue | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/components/user_card_content/user_card_content.vue b/src/components/user_card_content/user_card_content.vue index 09e91271..96923786 100644 --- a/src/components/user_card_content/user_card_content.vue +++ b/src/components/user_card_content/user_card_content.vue @@ -13,7 +13,8 @@ <StillImage class="avatar" :src="user.profile_image_url_original"/> </router-link> <div class="name-and-screen-name"> - <div :title="user.name" class='user-name'>{{user.name}}</div> + <div :title="user.name" class='user-name' v-if="user.name_html" v-html="user.name_html"></div> + <div :title="user.name" class='user-name' v-else>{{user.name}}</div> <router-link class='user-screen-name':to="{ name: 'user-profile', params: { id: user.id } }"> <span>@{{user.screen_name}}</span><span v-if="user.locked"><i class="icon icon-lock"></i></span> <span class="dailyAvg">{{dailyAvg}} {{ $t('user_card.per_day') }}</span> @@ -88,7 +89,8 @@ <span>{{user.followers_count}}</span> </div> </div> - <p v-if="!hideBio">{{user.description}}</p> + <p v-if="!hideBio && user.description_html" v-html="user.description_html"></p> + <p v-else-if="!hideBio">{{ user.description }}</p> </div> </div> </template> |