diff options
| author | Henry <spam@hjkos.com> | 2018-08-12 12:05:08 +0000 |
|---|---|---|
| committer | Henry <spam@hjkos.com> | 2018-08-12 12:05:08 +0000 |
| commit | 27adde9887d7205703ed461560f3272f6709b83b (patch) | |
| tree | b04030b899850b503097c2df1e7fde2a13043a7f /src/components/notification/notification.vue | |
| parent | 3d72c2b964e460762b7ccecc10ddb119fbe80ace (diff) | |
| parent | db6ff4824afa7adca1f3b633278e9ed033d8671d (diff) | |
Merge branch 'develop' into 'feature/accountHighlight'
# Conflicts:
# src/components/user_card_content/user_card_content.vue
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 97673752..bb76ddf8 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> |