summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-08-04 22:48:35 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-08-04 22:48:35 +0900
commit9a2ff56a79efc08be194022a3119843cea74a657 (patch)
tree1a6be546a7fdb18b41a4adb38e32eccc4207c4c4 /src
parentUpdate doc (diff)
downloadmisskey-9a2ff56a79efc08be194022a3119843cea74a657.tar.gz
misskey-9a2ff56a79efc08be194022a3119843cea74a657.tar.bz2
misskey-9a2ff56a79efc08be194022a3119843cea74a657.zip
動きのあるMFMを無効にするオプションを実装
Diffstat (limited to 'src')
-rw-r--r--src/client/app/common/views/components/misskey-flavored-markdown.ts2
-rw-r--r--src/client/app/desktop/views/components/settings.vue7
-rw-r--r--src/client/app/mobile/views/pages/settings.vue8
3 files changed, 16 insertions, 1 deletions
diff --git a/src/client/app/common/views/components/misskey-flavored-markdown.ts b/src/client/app/common/views/components/misskey-flavored-markdown.ts
index 096ffcbf8a..f9c97bd35a 100644
--- a/src/client/app/common/views/components/misskey-flavored-markdown.ts
+++ b/src/client/app/common/views/components/misskey-flavored-markdown.ts
@@ -63,7 +63,7 @@ export default Vue.component('misskey-flavored-markdown', {
attrs: {
style: 'display: inline-block; font-size: 200%;'
},
- directives: [{
+ directives: [this.$store.state.settings.disableAnimatedMfm ? {} : {
name: 'animate-css',
value: { classes: 'tada', iteration: 'infinite' }
}]
diff --git a/src/client/app/desktop/views/components/settings.vue b/src/client/app/desktop/views/components/settings.vue
index 00bd7a8783..84ea768a5c 100644
--- a/src/client/app/desktop/views/components/settings.vue
+++ b/src/client/app/desktop/views/components/settings.vue
@@ -55,6 +55,7 @@
<span>%i18n:@show-maps-desc%</span>
</mk-switch>
<mk-switch v-model="$store.state.settings.reversiBoardLabels" @change="onChangeReversiBoardLabels" text="%i18n:common.show-reversi-board-labels%"/>
+ <mk-switch v-model="$store.state.settings.disableAnimatedMfm" @change="onChangeDisableAnimatedMfm" text="%i18n:common.disable-animated-mfm%"/>
</section>
<section class="web" v-show="page == 'web'">
@@ -376,6 +377,12 @@ export default Vue.extend({
value: v
});
},
+ onChangeDisableAnimatedMfm(v) {
+ this.$store.dispatch('settings/set', {
+ key: 'disableAnimatedMfm',
+ value: v
+ });
+ },
onChangeGradientWindowHeader(v) {
this.$store.dispatch('settings/set', {
key: 'gradientWindowHeader',
diff --git a/src/client/app/mobile/views/pages/settings.vue b/src/client/app/mobile/views/pages/settings.vue
index 73bff55e44..63fca64ab1 100644
--- a/src/client/app/mobile/views/pages/settings.vue
+++ b/src/client/app/mobile/views/pages/settings.vue
@@ -14,6 +14,7 @@
<ui-switch v-model="$store.state.settings.circleIcons" @change="onChangeCircleIcons">%i18n:@circle-icons%</ui-switch>
<ui-switch v-model="$store.state.settings.iLikeSushi" @change="onChangeILikeSushi">%i18n:common.i-like-sushi%</ui-switch>
<ui-switch v-model="$store.state.settings.reversiBoardLabels" @change="onChangeReversiBoardLabels">%i18n:common.show-reversi-board-labels%</ui-switch>
+ <ui-switch v-model="$store.state.settings.disableAnimatedMfm" @change="onChangeDisableAnimatedMfm">%i18n:common.disable-animated-mfm%</ui-switch>
<div>
<div>%i18n:@timeline%</div>
@@ -192,6 +193,13 @@ export default Vue.extend({
});
},
+ onChangeDisableAnimatedMfm(v) {
+ this.$store.dispatch('settings/set', {
+ key: 'disableAnimatedMfm',
+ value: v
+ });
+ },
+
onChangeShowReplyTarget(v) {
this.$store.dispatch('settings/set', {
key: 'showReplyTarget',