summaryrefslogtreecommitdiff
path: root/src/client/app/mobile/views
diff options
context:
space:
mode:
authorAcid Chicken (硫酸鶏) <root@acid-chicken.com>2019-01-23 20:43:06 +0900
committerGitHub <noreply@github.com>2019-01-23 20:43:06 +0900
commit4632eecb7641d0933f7d391e14097ae4797d292b (patch)
tree11cc800fbe38fdc869baacae99a0eaafc7de1978 /src/client/app/mobile/views
parentMerge pull request #3965 from syuilo/l10n_develop (diff)
downloadmisskey-4632eecb7641d0933f7d391e14097ae4797d292b.tar.gz
misskey-4632eecb7641d0933f7d391e14097ae4797d292b.tar.bz2
misskey-4632eecb7641d0933f7d391e14097ae4797d292b.zip
Back to the #3813 (#3949)
* Revert "Revert "Resolve #3813 (#3814)"" This reverts commit f433182c4cd449a08eb436df30bee731345240c1. * Keep CW is back * New Wave https://github.com/syuilo/misskey/pull/3949#pullrequestreview-194787210
Diffstat (limited to 'src/client/app/mobile/views')
-rw-r--r--src/client/app/mobile/views/components/post-form.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/mobile/views/components/post-form.vue b/src/client/app/mobile/views/components/post-form.vue
index 24263d18fe..b6e70a5b11 100644
--- a/src/client/app/mobile/views/components/post-form.vue
+++ b/src/client/app/mobile/views/components/post-form.vue
@@ -210,6 +210,12 @@ export default Vue.extend({
});
}
+ // keep cw when reply
+ if (this.$store.state.settings.keepCw && this.reply && this.reply.cw) {
+ this.useCw = true;
+ this.cw = this.reply.cw;
+ }
+
this.focus();
this.$nextTick(() => {
diff --git a/src/client/app/mobile/views/pages/settings.vue b/src/client/app/mobile/views/pages/settings.vue
index 80b15acdea..cc7eb1e300 100644
--- a/src/client/app/mobile/views/pages/settings.vue
+++ b/src/client/app/mobile/views/pages/settings.vue
@@ -66,6 +66,7 @@
<section>
<ui-switch v-model="fetchOnScroll">{{ $t('fetch-on-scroll') }}</ui-switch>
+ <ui-switch v-model="keepCw">{{ $t('keep-cw') }}</ui-switch>
<ui-switch v-model="disableViaMobile">{{ $t('disable-via-mobile') }}</ui-switch>
<ui-switch v-model="loadRawImages">{{ $t('load-raw-images') }}</ui-switch>
<ui-switch v-model="loadRemoteMedia">{{ $t('load-remote-media') }}</ui-switch>
@@ -247,6 +248,11 @@ export default Vue.extend({
set(value) { this.$store.dispatch('settings/set', { key: 'fetchOnScroll', value }); }
},
+ keepCw: {
+ get() { return this.$store.state.settings.keepCw; },
+ set(value) { this.$store.dispatch('settings/set', { key: 'keepCw', value }); }
+ },
+
rememberNoteVisibility: {
get() { return this.$store.state.settings.rememberNoteVisibility; },
set(value) { this.$store.dispatch('settings/set', { key: 'rememberNoteVisibility', value }); }