worldcone/cherrypick
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Only show ellipsis if the button's interactable (#6373)

Browse source 
* Add an indicator to make the undo renote button look more interactable

* Use faEllipsisH :art

* Only show elipsis if it's interactable

* Update note.vue

Co-authored-by: DW <chocological00@gitlab.com>
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
This commit is contained in:
DW 2020-05-15 23:15:59 -04:00 committed by GitHub
parent 3ac3a45aa5
commit 9c8eb93446
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/client/components/note.vue
View file

@ -22,7 +22,7 @@
</i18n> </i18n>
<div class="info"> <div class="info">
<button class="_button time" @click="showRenoteMenu()" ref="renoteTime"> <button class="_button time" @click="showRenoteMenu()" ref="renoteTime">
<fa class="dropdownIcon" :icon="faEllipsisH"/> <fa class="dropdownIcon" v-if="isMyRenote" :icon="faEllipsisH"/>
<mk-time :time="note.createdAt"/> <mk-time :time="note.createdAt"/>
</button> </button>
<span class="visibility" v-if="note.visibility !== 'public'"> <span class="visibility" v-if="note.visibility !== 'public'">
@ -196,6 +196,10 @@ export default Vue.extend({
return this.$store.getters.isSignedIn && (this.$store.state.i.id === this.appearNote.userId); return this.$store.getters.isSignedIn && (this.$store.state.i.id === this.appearNote.userId);
}, },
isMyRenote(): boolean {
return this.$store.getters.isSignedIn && (this.$store.state.i.id === this.note.userId);
},
canRenote(): boolean { canRenote(): boolean {
return ['public', 'home'].includes(this.appearNote.visibility) || this.isMyNote; return ['public', 'home'].includes(this.appearNote.visibility) || this.isMyNote;
}, },
@ -617,7 +621,7 @@ export default Vue.extend({
}, },
showRenoteMenu(viaKeyboard = false) { showRenoteMenu(viaKeyboard = false) {
if (!this.$store.getters.isSignedIn || (this.$store.state.i.id !== this.note.userId)) return; if (!this.isMyRenote) return;
this.$root.menu({ this.$root.menu({
items: [{ items: [{
text: this.$t('unrenote'), text: this.$t('unrenote'),