summaryrefslogtreecommitdiff
path: root/src/client
diff options
context:
space:
mode:
authorMeiMei <30769358+mei23@users.noreply.github.com>2019-02-05 03:01:36 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2019-02-05 03:01:36 +0900
commitf014b7ae0ece886ef0cff2366b9925e23b34ba6f (patch)
treec35760467278da408348fcd459415af7a63e08e9 /src/client
parentRefactor: Better type definition (diff)
downloadsharkey-f014b7ae0ece886ef0cff2366b9925e23b34ba6f.tar.gz
sharkey-f014b7ae0ece886ef0cff2366b9925e23b34ba6f.tar.bz2
sharkey-f014b7ae0ece886ef0cff2366b9925e23b34ba6f.zip
アニメーションを自動再生しないオプション (#4131)
* Refactor * settings * Media Proxy * Replace API response
Diffstat (limited to 'src/client')
-rw-r--r--src/client/app/desktop/views/components/settings.vue6
-rw-r--r--src/client/app/mobile/views/pages/settings.vue6
2 files changed, 12 insertions, 0 deletions
diff --git a/src/client/app/desktop/views/components/settings.vue b/src/client/app/desktop/views/components/settings.vue
index 95c107a0d5..8ab956830e 100644
--- a/src/client/app/desktop/views/components/settings.vue
+++ b/src/client/app/desktop/views/components/settings.vue
@@ -117,6 +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="remainDeletedNote">{{ $t('remain-deleted-note') }}</ui-switch>
</section>
<section>
@@ -516,6 +517,11 @@ export default Vue.extend({
set(value) { this.$store.dispatch('settings/set', { key: 'disableAnimatedMfm', value }); }
},
+ doNotAutoplayAnimation: {
+ get() { return !!this.$store.state.settings.doNotAutoplayAnimation; },
+ set(value) { this.$store.dispatch('settings/set', { key: 'doNotAutoplayAnimation', value }); }
+ },
+
remainDeletedNote: {
get() { return this.$store.state.settings.remainDeletedNote; },
set(value) { this.$store.dispatch('settings/set', { key: 'remainDeletedNote', value }); }
diff --git a/src/client/app/mobile/views/pages/settings.vue b/src/client/app/mobile/views/pages/settings.vue
index cc7eb1e300..f7ddefc5f0 100644
--- a/src/client/app/mobile/views/pages/settings.vue
+++ b/src/client/app/mobile/views/pages/settings.vue
@@ -29,6 +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="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>
@@ -313,6 +314,11 @@ export default Vue.extend({
set(value) { this.$store.dispatch('settings/set', { key: 'disableAnimatedMfm', value }); }
},
+ doNotAutoplayAnimation: {
+ get() { return !!this.$store.state.settings.doNotAutoplayAnimation; },
+ set(value) { this.$store.dispatch('settings/set', { key: 'doNotAutoplayAnimation', value }); }
+ },
+
showReplyTarget: {
get() { return this.$store.state.settings.showReplyTarget; },
set(value) { this.$store.dispatch('settings/set', { key: 'showReplyTarget', value }); }