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/notification/notification.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/notification/notification.vue')
| -rw-r--r-- | src/components/notification/notification.vue | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/components/notification/notification.vue b/src/components/notification/notification.vue index eed598a8..208e389c 100644 --- a/src/components/notification/notification.vue +++ b/src/components/notification/notification.vue @@ -10,7 +10,8 @@ </div> <span class="notification-details"> <div class="name-and-action"> - <span class="username" :title="'@'+notification.action.user.screen_name">{{ notification.action.user.name }}</span> + <span class="username" v-if="!!notification.action.user.name_html" :title="'@'+notification.action.user.screen_name" v-html="notification.action.user.name_html"></span> + <span class="username" v-else :title="'@'+notification.action.user.screen_name">{{ notification.action.user.name }}</span> <span v-if="notification.type === 'favorite'"> <i class="fa icon-star lit"></i> <small>{{$t('notifications.favorited_you')}}</small> |