From c7d8cabe9c52c3761631470e780de272e30df5ef Mon Sep 17 00:00:00 2001 From: Ed Poe Date: Wed, 16 Nov 2022 13:07:57 -0500 Subject: [PATCH 1/4] Testing method for setting when to display global timeline. --- src/App.js | 1 + src/components/timeline_menu/timeline_menu_content.vue | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/App.js b/src/App.js index d4b3b41a..eba1c7bd 100644 --- a/src/App.js +++ b/src/App.js @@ -92,6 +92,7 @@ export default { editingAvailable () { return this.$store.state.instance.editingAvailable }, layoutType () { return this.$store.state.interface.layoutType }, privateMode () { return this.$store.state.instance.private }, + showPublicExternalTimeline () {return currentUser() || !(privateMode || this.$store.state.instance.restrict_unauthenticated.timelines.federated)} reverseLayout () { const { thirdColumnMode, sidebarRight: reverseSetting } = this.$store.getters.mergedConfig if (this.layoutType !== 'wide') { diff --git a/src/components/timeline_menu/timeline_menu_content.vue b/src/components/timeline_menu/timeline_menu_content.vue index 27aece22..a630aa71 100644 --- a/src/components/timeline_menu/timeline_menu_content.vue +++ b/src/components/timeline_menu/timeline_menu_content.vue @@ -48,7 +48,7 @@ >{{ $t("nav.public_tl") }} -
  • +
  • Date: Wed, 16 Nov 2022 13:19:12 -0500 Subject: [PATCH 2/4] Missed a comma. Oops. --- src/App.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App.js b/src/App.js index eba1c7bd..330f4d14 100644 --- a/src/App.js +++ b/src/App.js @@ -92,7 +92,7 @@ export default { editingAvailable () { return this.$store.state.instance.editingAvailable }, layoutType () { return this.$store.state.interface.layoutType }, privateMode () { return this.$store.state.instance.private }, - showPublicExternalTimeline () {return currentUser() || !(privateMode || this.$store.state.instance.restrict_unauthenticated.timelines.federated)} + showPublicExternalTimeline () {return currentUser() || !(privateMode || this.$store.state.instance.restrict_unauthenticated.timelines.federated)}, reverseLayout () { const { thirdColumnMode, sidebarRight: reverseSetting } = this.$store.getters.mergedConfig if (this.layoutType !== 'wide') { From cde3e556340d291bb17366af2fee49f122633571 Mon Sep 17 00:00:00 2001 From: Ed Poe Date: Wed, 16 Nov 2022 13:28:58 -0500 Subject: [PATCH 3/4] Fix style of new setter and refer to new value in desktop_nav --- src/App.js | 2 +- src/components/desktop_nav/desktop_nav.vue | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/App.js b/src/App.js index 330f4d14..fa67318f 100644 --- a/src/App.js +++ b/src/App.js @@ -92,7 +92,7 @@ export default { editingAvailable () { return this.$store.state.instance.editingAvailable }, layoutType () { return this.$store.state.interface.layoutType }, privateMode () { return this.$store.state.instance.private }, - showPublicExternalTimeline () {return currentUser() || !(privateMode || this.$store.state.instance.restrict_unauthenticated.timelines.federated)}, + showPublicExternalTimeline () {return currentUser() || !(privateMode || this.$store.state.instance.restrict_unauthenticated.timelines.federated) }, reverseLayout () { const { thirdColumnMode, sidebarRight: reverseSetting } = this.$store.getters.mergedConfig if (this.layoutType !== 'wide') { diff --git a/src/components/desktop_nav/desktop_nav.vue b/src/components/desktop_nav/desktop_nav.vue index 92d3fa5b..8105a351 100644 --- a/src/components/desktop_nav/desktop_nav.vue +++ b/src/components/desktop_nav/desktop_nav.vue @@ -67,6 +67,7 @@ /> From ce6d06f99885807ab9053ea05c6b621e47b3bdfa Mon Sep 17 00:00:00 2001 From: fedward Date: Wed, 16 Nov 2022 18:38:13 +0000 Subject: [PATCH 4/4] revert 328fef9163774cdae825e7cb6a0307c3d7f38eb2 This work went into a feature branch. Revert dev before applying the changes from that branch. --- src/components/desktop_nav/desktop_nav.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/desktop_nav/desktop_nav.vue b/src/components/desktop_nav/desktop_nav.vue index d7e37777..92d3fa5b 100644 --- a/src/components/desktop_nav/desktop_nav.vue +++ b/src/components/desktop_nav/desktop_nav.vue @@ -67,7 +67,6 @@ />