From d150dae5d156416351312f25b06de0013ee0a95d Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Tue, 10 Nov 2020 12:52:54 +0200
Subject: fixes to timeline error handling

---
 src/components/timeline_menu/timeline_menu.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/components/timeline_menu/timeline_menu.js')

diff --git a/src/components/timeline_menu/timeline_menu.js b/src/components/timeline_menu/timeline_menu.js
index 4ccd52b4..ef8a5813 100644
--- a/src/components/timeline_menu/timeline_menu.js
+++ b/src/components/timeline_menu/timeline_menu.js
@@ -19,7 +19,7 @@ library.add(
   faChevronDown
 )
 
-// Route -> i18n key mapping, exported andnot in the computed
+// Route -> i18n key mapping, exported and not in the computed
 // because nav panel benefits from the same information.
 export const timelineNames = () => {
   return {
@@ -27,8 +27,7 @@ export const timelineNames = () => {
     'bookmarks': 'nav.bookmarks',
     'dms': 'nav.dms',
     'public-timeline': 'nav.public_tl',
-    'public-external-timeline': 'nav.twkn',
-    'tag-timeline': 'tag'
+    'public-external-timeline': 'nav.twkn'
   }
 }
 
-- 
cgit v1.2.3-70-g09d2


From fa01030641de7be89206787f5e364318086e8524 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 3 Dec 2020 10:07:42 +0200
Subject: make click blocking actually work

---
 src/components/timeline_menu/timeline_menu.js  | 8 ++++++++
 src/components/timeline_menu/timeline_menu.vue | 6 ++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'src/components/timeline_menu/timeline_menu.js')

diff --git a/src/components/timeline_menu/timeline_menu.js b/src/components/timeline_menu/timeline_menu.js
index ef8a5813..8d6a58b1 100644
--- a/src/components/timeline_menu/timeline_menu.js
+++ b/src/components/timeline_menu/timeline_menu.js
@@ -59,6 +59,14 @@ const TimelineMenu = {
         this.isOpen = true
       }, 25)
     },
+    blockOpen (event) {
+      // For the blank area inside the button element.
+      // Just setting @click.stop="" makes unintuitive behavior when
+      // menu is open and clicking on the blank area doesn't close it.
+      if (!this.isOpen) {
+        event.stopPropagation()
+      }
+    },
     timelineName () {
       const route = this.$route.name
       if (route === 'tag-timeline') {
diff --git a/src/components/timeline_menu/timeline_menu.vue b/src/components/timeline_menu/timeline_menu.vue
index dd8dbf34..3c86842b 100644
--- a/src/components/timeline_menu/timeline_menu.vue
+++ b/src/components/timeline_menu/timeline_menu.vue
@@ -72,7 +72,10 @@
           icon="chevron-down"
         />
       </span>
-      <span class="click-blocker" />
+      <span
+        class="click-blocker"
+        @click="blockOpen"
+      />
     </div>
   </Popover>
 </template>
@@ -135,7 +138,6 @@
 
     .click-blocker {
       cursor: default;
-      pointer-events: none;
       flex-grow: 1;
     }
   }
-- 
cgit v1.2.3-70-g09d2