diff options
| author | Roger Braun <roger@rogerbraun.net> | 2017-03-09 09:00:09 +0100 |
|---|---|---|
| committer | Roger Braun <roger@rogerbraun.net> | 2017-03-09 09:00:09 +0100 |
| commit | b11c1f57a95e689a751c4dff72ebe7aabc9c0601 (patch) | |
| tree | b2596b07c3482c76493cc61974932cdf33e296ab /src/components/status | |
| parent | 502757da28d573641a48197c284b7e40dfc8154e (diff) | |
| parent | ba4f7ef3efe15aaebce523113283b5854d16ceb8 (diff) | |
Merge branch 'develop' into xj9/pleroma-fe-feature/even-better-nsfw-image-loading
Diffstat (limited to 'src/components/status')
| -rw-r--r-- | src/components/status/status.js | 6 | ||||
| -rw-r--r-- | src/components/status/status.vue | 9 |
2 files changed, 12 insertions, 3 deletions
diff --git a/src/components/status/status.js b/src/components/status/status.js index 22292ffa..bc9d6e6c 100644 --- a/src/components/status/status.js +++ b/src/components/status/status.js @@ -8,7 +8,8 @@ import UserCardContent from '../user_card_content/user_card_content.vue' const Status = { props: [ 'statusoid', - 'expandable' + 'expandable', + 'focused' ], data: () => ({ replying: false, @@ -30,7 +31,8 @@ const Status = { loggedIn () { 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.status.in_reply_to_status_id } }, components: { Attachment, diff --git a/src/components/status/status.vue b/src/components/status/status.vue index 585bf621..6476e1e5 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -1,5 +1,5 @@ <template> - <div class="status-el base00-background" v-if="!status.deleted" v-bind:class="{ 'expanded-status': !expandable }"> + <div class="status-el base00-background" v-if="!status.deleted" v-bind:class="[{ 'expanded-status': !expandable }, { 'base01-background': focused }]"> <template v-if="muted"> <div class="media status container muted"> <small><router-link :to="{ name: 'user-profile', params: { id: status.user.id } }">{{status.user.screen_name}}</router-link></small> @@ -34,6 +34,13 @@ {{status.in_reply_to_screen_name}} </router-link> </small> + <template v-if="isReply"> + <small> + <router-link :to="{ name: 'conversation', params: { id: status.in_reply_to_status_id } }"> + <i class="icon-reply"></i> + </router-link> + </small> + </template> - <small> <router-link :to="{ name: 'conversation', params: { id: status.id } }"> |