diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2019-02-05 04:09:44 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2019-02-05 04:09:44 +0900 |
| commit | dd39d6ea37443512a6c62c3e5fcbeb75ddf557a8 (patch) | |
| tree | 7e264e7d97b5b40d94639a9229b4924e3680e21c /src | |
| parent | [Client] Increase font size a little in the Deck view (diff) | |
| download | misskey-dd39d6ea37443512a6c62c3e5fcbeb75ddf557a8.tar.gz misskey-dd39d6ea37443512a6c62c3e5fcbeb75ddf557a8.tar.bz2 misskey-dd39d6ea37443512a6c62c3e5fcbeb75ddf557a8.zip | |
Better key name
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/app/common/views/components/avatar.vue | 2 | ||||
| -rw-r--r-- | src/client/app/common/views/components/emoji.vue | 2 | ||||
| -rw-r--r-- | src/client/app/common/views/components/media-image.vue | 2 | ||||
| -rw-r--r-- | src/client/app/desktop/views/components/settings.vue | 8 | ||||
| -rw-r--r-- | src/client/app/mobile/views/pages/settings.vue | 8 | ||||
| -rw-r--r-- | src/client/app/store.ts | 2 |
6 files changed, 12 insertions, 12 deletions
diff --git a/src/client/app/common/views/components/avatar.vue b/src/client/app/common/views/components/avatar.vue index 205b4a6d79..0c6cd7048c 100644 --- a/src/client/app/common/views/components/avatar.vue +++ b/src/client/app/common/views/components/avatar.vue @@ -49,7 +49,7 @@ export default Vue.extend({ }; }, url(): string { - return this.$store.state.device.doNotAutoplayAnimation + return this.$store.state.device.disableShowingAnimatedImages ? getStaticImageUrl(this.user.avatarUrl) : this.user.avatarUrl; }, diff --git a/src/client/app/common/views/components/emoji.vue b/src/client/app/common/views/components/emoji.vue index b791dcab6a..b4618a8d85 100644 --- a/src/client/app/common/views/components/emoji.vue +++ b/src/client/app/common/views/components/emoji.vue @@ -55,7 +55,7 @@ export default Vue.extend({ const customEmoji = this.customEmojis.find(x => x.name == this.name); if (customEmoji) { this.customEmoji = customEmoji; - this.url = this.$store.state.device.doNotAutoplayAnimation + this.url = this.$store.state.device.disableShowingAnimatedImages ? getStaticImageUrl(customEmoji.url) : customEmoji.url; } else { diff --git a/src/client/app/common/views/components/media-image.vue b/src/client/app/common/views/components/media-image.vue index 4433ec2afc..4a99b953ef 100644 --- a/src/client/app/common/views/components/media-image.vue +++ b/src/client/app/common/views/components/media-image.vue @@ -38,7 +38,7 @@ export default Vue.extend({ computed: { style(): any { let url = `url(${ - this.$store.state.device.doNotAutoplayAnimation + this.$store.state.device.disableShowingAnimatedImages ? getStaticImageUrl(this.image.thumbnailUrl) : this.image.thumbnailUrl })`; diff --git a/src/client/app/desktop/views/components/settings.vue b/src/client/app/desktop/views/components/settings.vue index be0244ee00..76d99ee3c0 100644 --- a/src/client/app/desktop/views/components/settings.vue +++ b/src/client/app/desktop/views/components/settings.vue @@ -117,7 +117,7 @@ <ui-switch v-model="showReplyTarget">{{ $t('show-reply-target') }}</ui-switch> <ui-switch v-model="showMaps">{{ $t('show-maps') }}</ui-switch> <ui-switch v-model="disableAnimatedMfm">{{ $t('@.disable-animated-mfm') }}</ui-switch> - <ui-switch v-model="doNotAutoplayAnimation">{{ $t('@.do-not-autoplay-animation') }}</ui-switch> + <ui-switch v-model="disableShowingAnimatedImages">{{ $t('@.disable-showing-animated-images') }}</ui-switch> <ui-switch v-model="remainDeletedNote">{{ $t('remain-deleted-note') }}</ui-switch> </section> <section> @@ -517,9 +517,9 @@ export default Vue.extend({ set(value) { this.$store.dispatch('settings/set', { key: 'disableAnimatedMfm', value }); } }, - doNotAutoplayAnimation: { - get() { return this.$store.state.device.doNotAutoplayAnimation; }, - set(value) { this.$store.commit('device/set', { key: 'doNotAutoplayAnimation', value }); } + disableShowingAnimatedImages: { + get() { return this.$store.state.device.disableShowingAnimatedImages; }, + set(value) { this.$store.commit('device/set', { key: 'disableShowingAnimatedImages', value }); } }, remainDeletedNote: { diff --git a/src/client/app/mobile/views/pages/settings.vue b/src/client/app/mobile/views/pages/settings.vue index 8c01b6ac26..e8b51d1271 100644 --- a/src/client/app/mobile/views/pages/settings.vue +++ b/src/client/app/mobile/views/pages/settings.vue @@ -29,7 +29,7 @@ <ui-switch v-model="useOsDefaultEmojis">{{ $t('@.use-os-default-emojis') }}</ui-switch> <ui-switch v-model="iLikeSushi">{{ $t('@.i-like-sushi') }}</ui-switch> <ui-switch v-model="disableAnimatedMfm">{{ $t('@.disable-animated-mfm') }}</ui-switch> - <ui-switch v-model="doNotAutoplayAnimation">{{ $t('@.do-not-autoplay-animation') }}</ui-switch> + <ui-switch v-model="disableShowingAnimatedImages">{{ $t('@.disable-showing-animated-images') }}</ui-switch> <ui-switch v-model="suggestRecentHashtags">{{ $t('@.suggest-recent-hashtags') }}</ui-switch> <ui-switch v-model="alwaysShowNsfw">{{ $t('@.always-show-nsfw') }} ({{ $t('@.this-setting-is-this-device-only') }})</ui-switch> </section> @@ -314,9 +314,9 @@ export default Vue.extend({ set(value) { this.$store.dispatch('settings/set', { key: 'disableAnimatedMfm', value }); } }, - doNotAutoplayAnimation: { - get() { return this.$store.state.device.doNotAutoplayAnimation; }, - set(value) { this.$store.commit('device/set', { key: 'doNotAutoplayAnimation', value }); } + disableShowingAnimatedImages: { + get() { return this.$store.state.device.disableShowingAnimatedImages; }, + set(value) { this.$store.commit('device/set', { key: 'disableShowingAnimatedImages', value }); } }, showReplyTarget: { diff --git a/src/client/app/store.ts b/src/client/app/store.ts index ef2e57170e..d0f61f8bc1 100644 --- a/src/client/app/store.ts +++ b/src/client/app/store.ts @@ -70,7 +70,7 @@ const defaultDeviceSettings = { deckTemporaryColumn: null, deckDefault: false, useOsDefaultEmojis: false, - doNotAutoplayAnimation: false + disableShowingAnimatedImages: false }; export default (os: MiOS) => new Vuex.Store({ |