aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHJ <30-hj@users.noreply.git.pleroma.social>2019-05-19 14:38:57 +0000
committerHJ <30-hj@users.noreply.git.pleroma.social>2019-05-19 14:38:57 +0000
commitfacf076d47207117afe3c220ad60313c8fd5367e (patch)
tree3d0bac8c68e3c2e00706b7585f1641411ce2d52e
parent5bf208f2d1de1e20964ab06b04561c170867090c (diff)
parent07d0143bda8d35b9743731711a2085f8399168c5 (diff)
Merge branch '542' into 'develop'
Hide three dot menu button if has no items Closes #542 See merge request pleroma/pleroma-fe!797
-rw-r--r--src/components/extra_buttons/extra_buttons.js3
-rw-r--r--src/components/extra_buttons/extra_buttons.vue2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/components/extra_buttons/extra_buttons.js b/src/components/extra_buttons/extra_buttons.js
index f70ecd1d..528da301 100644
--- a/src/components/extra_buttons/extra_buttons.js
+++ b/src/components/extra_buttons/extra_buttons.js
@@ -54,6 +54,9 @@ const ExtraButtons = {
},
canPin () {
return this.ownStatus && (this.status.visibility === 'public' || this.status.visibility === 'unlisted')
+ },
+ enabled () {
+ return this.canPin || this.canDelete
}
}
}
diff --git a/src/components/extra_buttons/extra_buttons.vue b/src/components/extra_buttons/extra_buttons.vue
index 38e933bb..ef11138d 100644
--- a/src/components/extra_buttons/extra_buttons.vue
+++ b/src/components/extra_buttons/extra_buttons.vue
@@ -3,7 +3,7 @@
trigger="click"
@hide='showDropDown = false'
append-to-body
- v-if="showPopper"
+ v-if="enabled && showPopper"
:options="{
placement: 'top',
modifiers: {