Troplo/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source 
Highlight original notice when expanding retweets

See merge request !43
This commit is contained in:
lambadalambda 2017-03-07 06:06:43 -05:00
commit aa0d207c94
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/components/conversation/conversation.js
View file

@ -49,7 +49,11 @@ const conversation = {
} }
}, },
focused: function (id) { 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)
}
} }
} }
} }

2
src/components/status/status.js
View file

@ -32,7 +32,7 @@ const Status = {
return !!this.$store.state.users.currentUser return !!this.$store.state.users.currentUser
}, },
muted () { return !this.unmuted && this.status.user.muted }, 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: { components: {
Attachment, Attachment,