commit: e7f5033c7d05038b116f7170fedc352a662cc646
parent 9432fcec7ddfce7fd52ee2ba3f0ef531d61d9b46
Author: Tusooa Zhu <tusooa@kazv.moe>
Date: Sun, 6 Mar 2022 13:57:48 -0500
Split conversation display style into two different settings
linear => linear (now default)
simple_tree => tree / conversationTreeAdvanced=false
tree => tree / conversationTreeAdvanced=true
Diffstat:
5 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js
@@ -81,10 +81,10 @@ const conversation = {
return this.$store.getters.mergedConfig.conversationDisplay
},
isTreeView () {
- return this.displayStyle === 'tree' || this.displayStyle === 'simple_tree'
+ return !this.isLinearView
},
treeViewIsSimple () {
- return this.displayStyle === 'simple_tree'
+ return !this.$store.getters.mergedConfig.conversationTreeAdvanced
},
isLinearView () {
return this.displayStyle === 'linear'
diff --git a/src/components/settings_modal/tabs/general_tab.js b/src/components/settings_modal/tabs/general_tab.js
@@ -20,7 +20,7 @@ const GeneralTab = {
value: mode,
label: this.$t(`settings.subject_line_${mode === 'masto' ? 'mastodon' : mode}`)
})),
- conversationDisplayOptions: ['tree', 'simple_tree', 'linear'].map(mode => ({
+ conversationDisplayOptions: ['tree', 'linear'].map(mode => ({
key: mode,
value: mode,
label: this.$t(`settings.conversation_display_${mode}`)
diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue
@@ -166,6 +166,11 @@
class="setting-list suboptions"
>
<li>
+ <BooleanSetting path="conversationTreeAdvanced">
+ {{ $t('settings.tree_advanced') }}
+ </BooleanSetting>
+ </li>
+ <li>
<label for="maxDepthInThread">
{{ $t('settings.max_depth_in_thread') }}
</label>
diff --git a/src/modules/config.js b/src/modules/config.js
@@ -85,6 +85,7 @@ export const defaultState = {
virtualScrolling: undefined, // instance default
sensitiveByDefault: undefined, // instance default
conversationDisplay: undefined, // instance default
+ conversationTreeAdvanced: undefined, // instance default
conversationOtherRepliesButton: undefined, // instance default
maxDepthInThread: 6
}
diff --git a/src/modules/instance.js b/src/modules/instance.js
@@ -53,7 +53,8 @@ const defaultState = {
theme: 'pleroma-dark',
virtualScrolling: true,
sensitiveByDefault: false,
- conversationDisplay: 'simple_tree',
+ conversationDisplay: 'linear',
+ conversationTreeAdvanced: false,
conversationOtherRepliesButton: 'below',
maxDepthInThread: 6,