aboutsummaryrefslogtreecommitdiff
path: root/src/components/timeline_menu/timeline_menu.js
diff options
context:
space:
mode:
authorShpuld Shpludson <shp@cock.li>2020-12-16 17:57:59 +0000
committerShpuld Shpludson <shp@cock.li>2020-12-16 17:57:59 +0000
commit3359d4ddf6ee6449bd230eb2056f08edbb3d355e (patch)
treeb3623cd0f3cbe1f79baa238d0b7d64028f0f2fd9 /src/components/timeline_menu/timeline_menu.js
parent10399c193a68fc14c0c72b0cf970bfe2605a247e (diff)
parenta2f1ad93f557940635829aeb97cafa45dc6ed11e (diff)
Merge branch 'fix/timeline-bar-clickables-offset' into 'develop'
Fix #923 block clicks in blank area of timeline menu, fix 'up-to-date' align Closes #923 See merge request pleroma/pleroma-fe!1300
Diffstat (limited to 'src/components/timeline_menu/timeline_menu.js')
-rw-r--r--src/components/timeline_menu/timeline_menu.js8
1 files changed, 8 insertions, 0 deletions
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') {