both bugs fixed. it's reactive and no more conflicting cards

This commit is contained in:
Henry Jameson 2018-06-19 16:17:50 +03:00
parent fa8c221f3a
commit 8ccebbe156
7 changed files with 41 additions and 44 deletions

View file

@ -38,19 +38,23 @@ const Status = {
},
repeaterClass () {
const user = this.statusoid.user
return highlightClass(user, this.$store)
return highlightClass(user)
},
userClass () {
const user = this.retweet ? (this.statusoid.retweeted_status.user) : this.statusoid.user
return highlightClass(user, this.$store)
return highlightClass(user)
},
repeaterStyle () {
const user = this.statusoid.user
return highlightStyle(user, this.$store)
const highlight = this.$store.state.config.highlight
const color = highlight[user.screen_name]
return highlightStyle(color)
},
userStyle () {
const user = this.retweet ? (this.statusoid.retweeted_status.user) : this.statusoid.user
return highlightStyle(user, this.$store)
const highlight = this.$store.state.config.highlight
const color = highlight[user.screen_name]
return highlightStyle(color)
},
hideAttachments () {
return (this.$store.state.config.hideAttachments && !this.inConversation) ||