diff options
| author | Shpuld Shpludson <shp@cock.li> | 2019-03-28 20:09:59 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2019-03-28 20:09:59 +0000 |
| commit | ee9aa400019a22951cfc51fd2d6a06c24697a6ba (patch) | |
| tree | edd76323ccce7af0bd6b2479b20387c4fc2c7731 /src | |
| parent | 7e8c2acc981b6d4f55e0fd898f1769a82658d49a (diff) | |
| parent | 6b5a84e2b3284156b3aa5a9de44d4140ad0a34f6 (diff) | |
Merge branch 'issues/#466' into 'develop'
show replies count right after reply icon
Closes #466
See merge request pleroma/pleroma-fe!716
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/status/status.vue | 6 | ||||
| -rw-r--r-- | src/services/entity_normalizer/entity_normalizer.service.js | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/components/status/status.vue b/src/components/status/status.vue index da329deb..1f415534 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -135,9 +135,8 @@ <div v-if="!noHeading && !isPreview" class='status-actions media-body'> <div v-if="loggedIn"> - <a href="#" v-on:click.prevent="toggleReplying" :title="$t('tool_tip.reply')"> - <i class="button-icon icon-reply" :class="{'icon-reply-active': replying}"></i> - </a> + <i class="button-icon icon-reply" v-on:click.prevent="toggleReplying" :title="$t('tool_tip.reply')" :class="{'icon-reply-active': replying}"></i> + <span v-if="status.replies_count > 0">{{status.replies_count}}</span> </div> <retweet-button :visibility='status.visibility' :loggedIn='loggedIn' :status='status'></retweet-button> <favorite-button :loggedIn='loggedIn' :status='status'></favorite-button> @@ -551,6 +550,7 @@ $status-margin: 0.75em; .icon-reply:hover { color: $fallback--cBlue; color: var(--cBlue, $fallback--cBlue); + cursor: pointer; } .icon-reply.icon-reply-active { diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js index 5cac3463..ea57e6b2 100644 --- a/src/services/entity_normalizer/entity_normalizer.service.js +++ b/src/services/entity_normalizer/entity_normalizer.service.js @@ -177,6 +177,7 @@ export const parseStatus = (data) => { output.in_reply_to_status_id = data.in_reply_to_id output.in_reply_to_user_id = data.in_reply_to_account_id + output.replies_count = data.replies_count // Missing!! fix in UI? // output.in_reply_to_screen_name = ??? |