diff options
| author | kaniini <nenolod@gmail.com> | 2018-08-24 21:51:54 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-08-24 21:51:54 +0000 |
| commit | 55650ff7ea9867cdb8adf7077b36bbb8c7bfcb75 (patch) | |
| tree | 54f5294c1bc470aca73c46ad985bbacc8352ff51 /src/components/settings | |
| parent | 14db3f279daed82011bdcc2bbad21450c08a4487 (diff) | |
| parent | da9629486679345689ab75a0c663c16887e524f6 (diff) | |
Merge branch 'reply-visibility' into 'develop'
Add settings for changing the visibility of replies in the timeline.
See merge request pleroma/pleroma-fe!314
Diffstat (limited to 'src/components/settings')
| -rw-r--r-- | src/components/settings/settings.js | 4 | ||||
| -rw-r--r-- | src/components/settings/settings.vue | 10 |
2 files changed, 14 insertions, 0 deletions
diff --git a/src/components/settings/settings.js b/src/components/settings/settings.js index c85ef59f..d5ca33cc 100644 --- a/src/components/settings/settings.js +++ b/src/components/settings/settings.js @@ -8,6 +8,7 @@ const settings = { hideAttachmentsLocal: this.$store.state.config.hideAttachments, hideAttachmentsInConvLocal: this.$store.state.config.hideAttachmentsInConv, hideNsfwLocal: this.$store.state.config.hideNsfw, + replyVisibilityLocal: this.$store.state.config.replyVisibility, loopVideoLocal: this.$store.state.config.loopVideo, loopVideoSilentOnlyLocal: this.$store.state.config.loopVideoSilentOnly, muteWordsString: this.$store.state.config.muteWords.join('\n'), @@ -44,6 +45,9 @@ const settings = { hideNsfwLocal (value) { this.$store.dispatch('setOption', { name: 'hideNsfw', value }) }, + replyVisibilityLocal (value) { + this.$store.dispatch('setOption', { name: 'replyVisibility', value }) + }, loopVideoLocal (value) { this.$store.dispatch('setOption', { name: 'loopVideo', value }) }, diff --git a/src/components/settings/settings.vue b/src/components/settings/settings.vue index 415317f0..9612876e 100644 --- a/src/components/settings/settings.vue +++ b/src/components/settings/settings.vue @@ -38,6 +38,16 @@ <input type="checkbox" id="hoverPreview" v-model="hoverPreviewLocal"> <label for="hoverPreview">{{$t('settings.reply_link_preview')}}</label> </li> + <li> + <label for="replyVisibility" class="select"> + <select id="replyVisibility" v-model="replyVisibilityLocal"> + <option value="all" selected>{{$t('settings.reply_visibility_all')}}</option> + <option value="following">{{$t('settings.reply_visibility_following')}}</option> + <option value="self">{{$t('settings.reply_visibility_self')}}</option> + </select> + <i class="icon-down-open"/> + </label> + </li> </ul> </div> <div class="setting-item"> |