From 8ccebbe1564fe76b376eee83ad985b934edcbfa9 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Tue, 19 Jun 2018 16:17:50 +0300 Subject: both bugs fixed. it's reactive and no more conflicting cards --- src/components/status/status.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src/components/status/status.js') diff --git a/src/components/status/status.js b/src/components/status/status.js index fcdc6f61..2b5bcb55 100644 --- a/src/components/status/status.js +++ b/src/components/status/status.js @@ -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) || -- cgit v1.2.3-70-g09d2