diff options
Diffstat (limited to 'src/components/user_card')
| -rw-r--r-- | src/components/user_card/user_card.js | 4 | ||||
| -rw-r--r-- | src/components/user_card/user_card.vue | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/components/user_card/user_card.js b/src/components/user_card/user_card.js index 63dfa6ed..92cd0e54 100644 --- a/src/components/user_card/user_card.js +++ b/src/components/user_card/user_card.js @@ -73,12 +73,12 @@ export default { userHighlightType: { get () { const data = this.$store.state.config.highlight[this.user.screen_name] - return data && data.type || 'disabled' + return (data && data.type) || 'disabled' }, set (type) { const data = this.$store.state.config.highlight[this.user.screen_name] if (type !== 'disabled') { - this.$store.dispatch('setHighlight', { user: this.user.screen_name, color: data && data.color || '#FFFFFF', type }) + this.$store.dispatch('setHighlight', { user: this.user.screen_name, color: (data && data.color) || '#FFFFFF', type }) } else { this.$store.dispatch('setHighlight', { user: this.user.screen_name, color: undefined }) } diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue index 7ad8aa1d..5a5a4881 100644 --- a/src/components/user_card/user_card.vue +++ b/src/components/user_card/user_card.vue @@ -15,12 +15,14 @@ </router-link> <div class="user-summary"> <div class="top-line"> + <!-- eslint-disable vue/no-v-html --> <div v-if="user.name_html" :title="user.name" class="user-name" v-html="user.name_html" /> + <!-- eslint-enable vue/no-v-html --> <div v-else :title="user.name" @@ -237,12 +239,14 @@ <span>{{ user.followers_count }}</span> </div> </div> + <!-- eslint-disable vue/no-v-html --> <p v-if="!hideBio && user.description_html" class="user-card-bio" @click.prevent="linkClicked" v-html="user.description_html" /> + <!-- eslint-enable vue/no-v-html --> <p v-else-if="!hideBio" class="user-card-bio" |