From 553635742489e0d61f45b8c0052d1fa5893861b6 Mon Sep 17 00:00:00 2001 From: Sam Therapy Date: Sun, 6 Feb 2022 11:52:59 -0600 Subject: [PATCH] Add an option to expand the dropdown and make it the default Signed-off-by: Sam Therapy --- src/components/nav_panel/nav_panel.js | 2 +- src/components/settings_modal/tabs/general_tab.vue | 7 +++++++ src/i18n/en.json | 1 + src/modules/config.js | 3 ++- src/modules/instance.js | 1 + 5 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/components/nav_panel/nav_panel.js b/src/components/nav_panel/nav_panel.js index 6cc0b486..cedbbd1c 100644 --- a/src/components/nav_panel/nav_panel.js +++ b/src/components/nav_panel/nav_panel.js @@ -39,7 +39,7 @@ const NavPanel = { }, data () { return { - showTimelines: true + showTimelines: this.$store.getters.mergedConfig.showTimelines } }, methods: { diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue index a98431a5..2641a748 100644 --- a/src/components/settings_modal/tabs/general_tab.vue +++ b/src/components/settings_modal/tabs/general_tab.vue @@ -78,6 +78,13 @@ {{ $t('settings.hide_shoutbox') }} +
  • + + {{ $t('settings.showTimelines') }} + +
  • diff --git a/src/i18n/en.json b/src/i18n/en.json index a33bdb51..50c18ccb 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -508,6 +508,7 @@ "greentext": "Meme arrows", "conversation_view": "Conversation View", "mentions": "Mentions", + "showTimelines": "Expand timeline options by default", "show_yous": "Show (You)s", "notifications": "Notifications", "notification_setting_filters": "Filters", diff --git a/src/modules/config.js b/src/modules/config.js index 60bfacff..2d65c76e 100644 --- a/src/modules/config.js +++ b/src/modules/config.js @@ -91,7 +91,8 @@ export const defaultState = { sensitiveByDefault: undefined, // instance default conversationDisplay: undefined, // instance default conversationOtherRepliesButton: undefined, // instance default - maxDepthInThread: 18 + maxDepthInThread: 18, + showTimelines: undefined // instance default } // caching the instance default properties diff --git a/src/modules/instance.js b/src/modules/instance.js index cd17c23d..2c7a88fd 100644 --- a/src/modules/instance.js +++ b/src/modules/instance.js @@ -56,6 +56,7 @@ const defaultState = { conversationDisplay: 'simple_tree', conversationOtherRepliesButton: 'below', maxDepthInThread: 6, + showTimelines: true, // Nasty stuff customEmoji: [],