commit: d7647be81230dd9e016235cc9363d4cf048183c6
parent: 6504d8ca0ffaad9509fbbf3fc610d4a15538aead
Author: Shpuld Shpludson <shp@cock.li>
Date: Wed, 21 Aug 2019 04:56:38 +0000
Merge branch '645' into 'develop'
Show "Mute Conversation" menu item and three dot button to users and only if needed
Closes #645
See merge request pleroma/pleroma-fe!922
Diffstat:
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/components/extra_buttons/extra_buttons.js b/src/components/extra_buttons/extra_buttons.js
@@ -40,6 +40,9 @@ const ExtraButtons = {
},
canPin () {
return this.ownStatus && (this.status.visibility === 'public' || this.status.visibility === 'unlisted')
+ },
+ canMute () {
+ return !!this.currentUser
}
}
}
diff --git a/src/components/extra_buttons/extra_buttons.vue b/src/components/extra_buttons/extra_buttons.vue
@@ -1,5 +1,6 @@
<template>
<v-popover
+ v-if="canDelete || canMute || canPin"
trigger="click"
placement="top"
class="extra-button-popover"
@@ -9,14 +10,14 @@
<div slot="popover">
<div class="dropdown-menu">
<button
- v-if="!status.muted"
+ v-if="canMute && !status.muted"
class="dropdown-item dropdown-item-icon"
@click.prevent="muteConversation"
>
<i class="icon-eye-off" /><span>{{ $t("status.mute_conversation") }}</span>
</button>
<button
- v-if="status.muted"
+ v-if="canMute && status.muted"
class="dropdown-item dropdown-item-icon"
@click.prevent="unmuteConversation"
>