diff options
| author | MeiMei <30769358+mei23@users.noreply.github.com> | 2019-05-14 02:53:05 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2019-05-14 02:53:05 +0900 |
| commit | b128b593c205df895d8d9d3c5763d87f7e7ebd71 (patch) | |
| tree | 1fbc3ff96055b263c9524d0f422e0cb1a3910976 | |
| parent | Fix meta tags (#4918) (diff) | |
| download | sharkey-b128b593c205df895d8d9d3c5763d87f7e7ebd71.tar.gz sharkey-b128b593c205df895d8d9d3c5763d87f7e7ebd71.tar.bz2 sharkey-b128b593c205df895d8d9d3c5763d87f7e7ebd71.zip | |
Fix: user menu (#4845) (#4920)
* Fix: Firefoxで自分のメニューが開けないなど
* 自分のユーザーメニューにはミュートなどを表示しないようになど
| -rw-r--r-- | src/client/app/common/views/components/user-menu.vue | 31 | ||||
| -rw-r--r-- | src/client/app/desktop/views/home/user/user.header.vue | 13 |
2 files changed, 18 insertions, 26 deletions
diff --git a/src/client/app/common/views/components/user-menu.vue b/src/client/app/common/views/components/user-menu.vue index 0af0fdb7e4..7cbffa9f9a 100644 --- a/src/client/app/common/views/components/user-menu.vue +++ b/src/client/app/common/views/components/user-menu.vue @@ -7,7 +7,6 @@ <script lang="ts"> import Vue from 'vue'; import i18n from '../../../i18n'; -import copyToClipboard from '../../../common/scripts/copy-to-clipboard'; import { faExclamationCircle, faMicrophoneSlash } from '@fortawesome/free-solid-svg-icons'; import { faSnowflake } from '@fortawesome/free-regular-svg-icons'; @@ -27,19 +26,23 @@ export default Vue.extend({ icon: ['fas', 'list'], text: this.$t('push-to-list'), action: this.pushList - }, null, { - icon: this.user.isMuted ? ['fas', 'eye'] : ['far', 'eye-slash'], - text: this.user.isMuted ? this.$t('unmute') : this.$t('mute'), - action: this.toggleMute - }, { - icon: 'ban', - text: this.user.isBlocking ? this.$t('unblock') : this.$t('block'), - action: this.toggleBlock - }, null, { - icon: faExclamationCircle, - text: this.$t('report-abuse'), - action: this.reportAbuse - }]; + }] as any; + + if (this.$store.getters.isSignedIn && this.$store.state.i.id != this.user.id) { + menu = menu.concat([null, { + icon: this.user.isMuted ? ['fas', 'eye'] : ['far', 'eye-slash'], + text: this.user.isMuted ? this.$t('unmute') : this.$t('mute'), + action: this.toggleMute + }, { + icon: 'ban', + text: this.user.isBlocking ? this.$t('unblock') : this.$t('block'), + action: this.toggleBlock + }, null, { + icon: faExclamationCircle, + text: this.$t('report-abuse'), + action: this.reportAbuse + }]); + } if (this.$store.getters.isSignedIn && (this.$store.state.i.isAdmin || this.$store.state.i.isModerator)) { menu = menu.concat([null, { diff --git a/src/client/app/desktop/views/home/user/user.header.vue b/src/client/app/desktop/views/home/user/user.header.vue index e21757ccf9..52a5165c3f 100644 --- a/src/client/app/desktop/views/home/user/user.header.vue +++ b/src/client/app/desktop/views/home/user/user.header.vue @@ -1,7 +1,7 @@ <template> <div class="header" :class="{ shadow: $store.state.device.useShadow, round: $store.state.device.roundedCorners }"> <div class="banner-container" :style="style"> - <div class="banner" ref="banner" :style="style" @click="onBannerClick"></div> + <div class="banner" ref="banner" :style="style"></div> <div class="fade"></div> <div class="title"> <p class="name"> @@ -105,14 +105,6 @@ export default Vue.extend({ if (blur <= 10) banner.style.filter = `blur(${blur}px)`; }, - onBannerClick() { - if (!this.$store.getters.isSignedIn || this.$store.state.i.id != this.user.id) return; - - this.$updateBanner().then(i => { - this.user.bannerUrl = i.bannerUrl; - }); - }, - menu() { this.$root.new(XUserMenu, { source: this.$refs.menu, @@ -171,9 +163,6 @@ export default Vue.extend({ > .menu height 100% - display block - position absolute - left -42px padding 0 14px color #fff text-shadow 0 0 8px #000 |