logo

pleroma-fe

My custom branche(s) on git.pleroma.social/pleroma/pleroma-fe
commit: aa0d207c945d61678801910719b0b013df75a78a
parent: e64a5beb35ca7c356054b68c861cc44ccac42bc5
Author: lambadalambda <gitgud@rogerbraun.net>
Date:   Tue,  7 Mar 2017 06:06:43 -0500

Merge branch 'fix/highlight-expanded-retweets' into 'develop'

Highlight original notice when expanding retweets

See merge request !43

Diffstat:

Msrc/components/conversation/conversation.js6+++++-
Msrc/components/status/status.js2+-
2 files changed, 6 insertions(+), 2 deletions(-)

diff --git 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 @@ -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,