diff options
| author | Acid Chicken (硫酸鶏) <root@acid-chicken.com> | 2019-01-23 20:43:06 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-23 20:43:06 +0900 |
| commit | 4632eecb7641d0933f7d391e14097ae4797d292b (patch) | |
| tree | 11cc800fbe38fdc869baacae99a0eaafc7de1978 /src/client/app/desktop/views/components | |
| parent | Merge pull request #3965 from syuilo/l10n_develop (diff) | |
| download | misskey-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/desktop/views/components')
| -rw-r--r-- | src/client/app/desktop/views/components/post-form.vue | 6 | ||||
| -rw-r--r-- | src/client/app/desktop/views/components/settings.vue | 12 |
2 files changed, 17 insertions, 1 deletions
diff --git a/src/client/app/desktop/views/components/post-form.vue b/src/client/app/desktop/views/components/post-form.vue index 9c2807663b..5b2a305404 100644 --- a/src/client/app/desktop/views/components/post-form.vue +++ b/src/client/app/desktop/views/components/post-form.vue @@ -222,6 +222,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.$nextTick(() => { // 書きかけの投稿を復元 if (!this.instant && !this.mention) { diff --git a/src/client/app/desktop/views/components/settings.vue b/src/client/app/desktop/views/components/settings.vue index bd17018a6f..95c107a0d5 100644 --- a/src/client/app/desktop/views/components/settings.vue +++ b/src/client/app/desktop/views/components/settings.vue @@ -31,7 +31,12 @@ <ui-switch v-model="autoPopout">{{ $t('auto-popout') }} <span slot="desc">{{ $t('auto-popout-desc') }}</span> </ui-switch> - <ui-switch v-model="deckNav">{{ $t('deck-nav') }}<span slot="desc">{{ $t('deck-nav-desc') }}</span></ui-switch> + <ui-switch v-model="deckNav">{{ $t('deck-nav') }} + <span slot="desc">{{ $t('deck-nav-desc') }}</span> + </ui-switch> + <ui-switch v-model="keepCw">{{ $t('keep-cw') }} + <span slot="desc">{{ $t('keep-cw-desc') }}</span> + </ui-switch> </section> <section> @@ -336,6 +341,11 @@ export default Vue.extend({ set(value) { this.$store.commit('settings/set', { key: 'deckNav', value }); } }, + keepCw: { + get() { return this.$store.state.settings.keepCw; }, + set(value) { this.$store.commit('settings/set', { key: 'keepCw', value }); } + }, + darkmode: { get() { return this.$store.state.device.darkmode; }, set(value) { this.$store.commit('device/set', { key: 'darkmode', value }); } |