moon
/
pleroma-fe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'advanced-misclick-guard' into 'develop' 

Instead of blocking all interaction, only block interaction in places that matter

See merge request pleroma/pleroma-fe!1276
This commit is contained in:
Shpuld Shpludson 2020-11-04 06:04:19 +00:00
parent b485d21ba9 d126eddfca
commit dbeecd18ac
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/components/status/status.scss
View File

@ -59,6 +59,15 @@ $status-margin: 0.75em;
justify-content: flex-end; justify-content: flex-end;
} }
._misclick-prevention & {
pointer-events: none;
.attachments {
pointer-events: initial;
cursor: initial;
}
}
.left-side { .left-side {
margin-right: $status-margin; margin-right: $status-margin;
} }

2
src/components/timeline/timeline.js
View File

@ -72,7 +72,7 @@ const Timeline = {
}, },
classes () { classes () {
let rootClasses = !this.embedded ? ['panel', 'panel-default'] : [] let rootClasses = !this.embedded ? ['panel', 'panel-default'] : []
if (this.blockingClicks) rootClasses = rootClasses.concat(['-blocked']) if (this.blockingClicks) rootClasses = rootClasses.concat(['-blocked', '_misclick-prevention'])
return { return {
root: rootClasses, root: rootClasses,
header: ['timeline-heading'].concat(!this.embedded ? ['panel-heading'] : []), header: ['timeline-heading'].concat(!this.embedded ? ['panel-heading'] : []),

2
src/components/timeline/timeline.vue
View File

@ -113,7 +113,7 @@
} }
&.-blocked { &.-blocked {
pointer-events: none; cursor: progress;
} }
} }