diff options
| author | lambadalambda <gitgud@rogerbraun.net> | 2017-03-07 06:06:43 -0500 |
|---|---|---|
| committer | lambadalambda <gitgud@rogerbraun.net> | 2017-03-07 06:06:43 -0500 |
| commit | aa0d207c945d61678801910719b0b013df75a78a (patch) | |
| tree | d69b051de73c2f078b8c41cb5073bf1f5c99d141 /src | |
| parent | e64a5beb35ca7c356054b68c861cc44ccac42bc5 (diff) | |
| parent | 9d56721533d46cbd88db8e64edb8d6fddf61298e (diff) | |
Merge branch 'fix/highlight-expanded-retweets' into 'develop'
Highlight original notice when expanding retweets
See merge request !43
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/conversation/conversation.js | 6 | ||||
| -rw-r--r-- | src/components/status/status.js | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js index a598b521..769893d3 100644 --- a/src/components/conversation/conversation.js +++ b/src/components/conversation/conversation.js @@ -49,7 +49,11 @@ const conversation = { } }, focused: function (id) { - return (id === this.statusoid.id) + if (!!this.statusoid.retweeted_status) { + return (id === this.statusoid.retweeted_status.id) + } else { + return (id === this.statusoid.id) + } } } } diff --git a/src/components/status/status.js b/src/components/status/status.js index 101a0e14..bc9d6e6c 100644 --- a/src/components/status/status.js +++ b/src/components/status/status.js @@ -32,7 +32,7 @@ const Status = { return !!this.$store.state.users.currentUser }, muted () { return !this.unmuted && this.status.user.muted }, - isReply () { return !!this.statusoid.in_reply_to_status_id } + isReply () { return !!this.status.in_reply_to_status_id } }, components: { Attachment, |