diff options
| author | Satsuki Yanagi <17376330+u1-liquid@users.noreply.github.com> | 2020-04-13 23:55:36 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-13 23:55:36 +0900 |
| commit | 58d3a379081b289a2da9a389be4f0a6cef353b11 (patch) | |
| tree | 908f0e1b42995120ab742b4da0a6931a8588f8fa /src/client/components | |
| parent | feat(client): Improve pages aiscript (diff) | |
| download | misskey-58d3a379081b289a2da9a389be4f0a6cef353b11.tar.gz misskey-58d3a379081b289a2da9a389be4f0a6cef353b11.tar.bz2 misskey-58d3a379081b289a2da9a389be4f0a6cef353b11.zip | |
sensitiveではないメディアも非表示にできるように (#6248)
* sensitiveではないメディアも非表示にできるように
* mounted -> created
* remove unnecessary v-if
Diffstat (limited to 'src/client/components')
| -rw-r--r-- | src/client/components/media-image.vue | 7 | ||||
| -rw-r--r-- | src/client/components/media-video.vue | 15 |
2 files changed, 15 insertions, 7 deletions
diff --git a/src/client/components/media-image.vue b/src/client/components/media-image.vue index bd53f82422..6c33b657ff 100644 --- a/src/client/components/media-image.vue +++ b/src/client/components/media-image.vue @@ -1,12 +1,12 @@ <template> -<div class="qjewsnkgzzxlxtzncydssfbgjibiehcy" v-if="image.isSensitive && hide && !$store.state.device.alwaysShowNsfw" @click="hide = false"> +<div class="qjewsnkgzzxlxtzncydssfbgjibiehcy" v-if="hide" @click="hide = false"> <div> <b><fa :icon="faExclamationTriangle"/> {{ $t('sensitive') }}</b> <span>{{ $t('clickToShow') }}</span> </div> </div> <div class="gqnyydlzavusgskkfvwvjiattxdzsqlf" v-else> - <i><fa :icon="faEyeSlash" @click="hide = true"></fa></i> + <i><fa :icon="faEyeSlash" @click="hide = true"/></i> <a :href="image.url" :style="style" @@ -63,6 +63,9 @@ export default Vue.extend({ }; } }, + created() { + this.hide = this.image.isSensitive && !this.$store.state.device.alwaysShowNsfw; + }, methods: { onClick() { if (this.$store.state.device.imageNewTab) { diff --git a/src/client/components/media-video.vue b/src/client/components/media-video.vue index 4327d07093..d9b4415cbf 100644 --- a/src/client/components/media-video.vue +++ b/src/client/components/media-video.vue @@ -1,12 +1,12 @@ <template> -<div class="icozogqfvdetwohsdglrbswgrejoxbdj" v-if="video.isSensitive && hide && !$store.state.device.alwaysShowNsfw" @click="hide = false"> +<div class="icozogqfvdetwohsdglrbswgrejoxbdj" v-if="hide" @click="hide = false"> <div> - <b><fa icon="exclamation-triangle"/> {{ $t('sensitive') }}</b> + <b><fa :icon="faExclamationTriangle"/> {{ $t('sensitive') }}</b> <span>{{ $t('clickToShow') }}</span> </div> </div> <div class="kkjnbbplepmiyuadieoenjgutgcmtsvu" v-else> - <i><fa :icon="faEyeSlash" @click="hide = true"></fa></i> + <i><fa :icon="faEyeSlash" @click="hide = true"/></i> <a :href="video.url" rel="nofollow noopener" @@ -21,7 +21,8 @@ <script lang="ts"> import Vue from 'vue'; -import { faPlayCircle, faEyeSlash } from '@fortawesome/free-regular-svg-icons'; +import { faPlayCircle } from '@fortawesome/free-regular-svg-icons'; +import { faExclamationTriangle, faEyeSlash } from '@fortawesome/free-solid-svg-icons'; import i18n from '../i18n'; export default Vue.extend({ @@ -36,6 +37,7 @@ export default Vue.extend({ return { hide: true, faPlayCircle, + faExclamationTriangle, faEyeSlash }; }, @@ -45,7 +47,10 @@ export default Vue.extend({ 'background-image': `url(${this.video.thumbnailUrl})` }; } - } + }, + created() { + this.hide = this.video.isSensitive && !this.$store.state.device.alwaysShowNsfw; + }, }); </script> |