diff options
| author | Henry <spam@hjkos.com> | 2018-08-12 12:05:08 +0000 |
|---|---|---|
| committer | Henry <spam@hjkos.com> | 2018-08-12 12:05:08 +0000 |
| commit | 27adde9887d7205703ed461560f3272f6709b83b (patch) | |
| tree | b04030b899850b503097c2df1e7fde2a13043a7f /src/components/retweet_button | |
| parent | 3d72c2b964e460762b7ccecc10ddb119fbe80ace (diff) | |
| parent | db6ff4824afa7adca1f3b633278e9ed033d8671d (diff) | |
Merge branch 'develop' into 'feature/accountHighlight'
# Conflicts:
# src/components/user_card_content/user_card_content.vue
Diffstat (limited to 'src/components/retweet_button')
| -rw-r--r-- | src/components/retweet_button/retweet_button.js | 2 | ||||
| -rw-r--r-- | src/components/retweet_button/retweet_button.vue | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/components/retweet_button/retweet_button.js b/src/components/retweet_button/retweet_button.js index 9833e8b2..cafa9cbc 100644 --- a/src/components/retweet_button/retweet_button.js +++ b/src/components/retweet_button/retweet_button.js @@ -1,5 +1,5 @@ const RetweetButton = { - props: ['status', 'loggedIn'], + props: ['status', 'loggedIn', 'visibility'], data () { return { animated: false diff --git a/src/components/retweet_button/retweet_button.vue b/src/components/retweet_button/retweet_button.vue index 1bee3d08..f5b00599 100644 --- a/src/components/retweet_button/retweet_button.vue +++ b/src/components/retweet_button/retweet_button.vue @@ -1,9 +1,9 @@ <template> - <div v-if="loggedIn"> + <div v-if="loggedIn && visibility !== 'private' && visibility !== 'direct'"> <i :class='classes' class='icon-retweet rt-active' v-on:click.prevent='retweet()'></i> <span v-if='status.repeat_num > 0'>{{status.repeat_num}}</span> </div> - <div v-else> + <div v-else-if="!loggedIn"> <i :class='classes' class='icon-retweet'></i> <span v-if='status.repeat_num > 0'>{{status.repeat_num}}</span> </div> |