summaryrefslogtreecommitdiff
path: root/src/client/app/common/views/components/settings
diff options
context:
space:
mode:
authortamaina <tamaina@hotmail.co.jp>2019-07-08 13:46:31 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2019-07-08 13:46:31 +0900
commit5343b005df9446c3cc13bdfb419db9b8720e5946 (patch)
treebc8c8bdf0da2d3d9237eed2a4f14309c6c26c410 /src/client/app/common/views/components/settings
parentBetter display in narrow desktop and choosing client type; Fix #1442, Fix #21... (diff)
downloadmisskey-5343b005df9446c3cc13bdfb419db9b8720e5946.tar.gz
misskey-5343b005df9446c3cc13bdfb419db9b8720e5946.tar.bz2
misskey-5343b005df9446c3cc13bdfb419db9b8720e5946.zip
Improve paste uploading Resolve #3023 (#4542)
* resolve #3023 * fix * fix * better description * widget * fix text * Update post-form.vue * Fix enter-file-name dialog title text * Fix type * On messaging room * Replace moment.js to original one * Fix formatDateTimeString
Diffstat (limited to 'src/client/app/common/views/components/settings')
-rw-r--r--src/client/app/common/views/components/settings/settings.vue24
1 files changed, 23 insertions, 1 deletions
diff --git a/src/client/app/common/views/components/settings/settings.vue b/src/client/app/common/views/components/settings/settings.vue
index 5f370c8be7..281524979e 100644
--- a/src/client/app/common/views/components/settings/settings.vue
+++ b/src/client/app/common/views/components/settings/settings.vue
@@ -140,7 +140,19 @@
<section>
<header>{{ $t('@._settings.web-search-engine') }}</header>
- <ui-input v-model="webSearchEngine">{{ $t('@._settings.web-search-engine') }}<template #desc>{{ $t('@._settings.web-search-engine-desc') }}</template></ui-input>
+ <ui-input v-model="webSearchEngine">{{ $t('@._settings.web-search-engine') }}
+ <template #desc>{{ $t('@._settings.web-search-engine-desc') }}</template>
+ </ui-input>
+ </section>
+
+ <section v-if="!$root.isMobile">
+ <header>{{ $t('@._settings.paste') }}</header>
+ <ui-input v-model="pastedFileName">{{ $t('@._settings.pasted-file-name') }}
+ <template #desc>{{ $t('@._settings.pasted-file-name-desc') }}</template>
+ </ui-input>
+ <ui-switch v-model="pasteDialog">{{ $t('@._settings.paste-dialog') }}
+ <template #desc>{{ $t('@._settings.paste-dialog-desc') }}</template>
+ </ui-switch>
</section>
</ui-card>
@@ -412,6 +424,16 @@ export default Vue.extend({
set(value) { this.$store.dispatch('settings/set', { key: 'webSearchEngine', value }); }
},
+ pastedFileName: {
+ get() { return this.$store.state.settings.pastedFileName; },
+ set(value) { this.$store.dispatch('settings/set', { key: 'pastedFileName', value }); }
+ },
+
+ pasteDialog: {
+ get() { return this.$store.state.settings.pasteDialog; },
+ set(value) { this.$store.dispatch('settings/set', { key: 'pasteDialog', value }); }
+ },
+
showReplyTarget: {
get() { return this.$store.state.settings.showReplyTarget; },
set(value) { this.$store.dispatch('settings/set', { key: 'showReplyTarget', value }); }