luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-02 21:14:47 +00:00
Code Issues Projects Releases Wiki Activity

Fix opening/closing gifv sometimes making the timeline scroll

Browse source
This commit is contained in:
Thibaut Girka 2019-04-16 18:45:04 +02:00 committed by ThibG
parent f11ad4023c
commit fbec0edf08
3 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/javascript/flavours/glitch/components/media_gallery.js
View file

@ -82,11 +82,6 @@ class Item extends React.PureComponent {
e.stopPropagation();
}
handleMouseDown = (e) => {
e.preventDefault();
e.stopPropagation();
}
render () {
const { attachment, index, size, standalone, letterbox, displayWidth } = this.props;
@ -190,7 +185,6 @@ class Item extends React.PureComponent {
onClick={this.handleClick}
onMouseEnter={this.handleMouseEnter}
onMouseLeave={this.handleMouseLeave}
onMouseDown={this.handleMouseDown}
autoPlay={autoPlay}
loop
muted

2
app/javascript/flavours/glitch/components/modal_root.js
View file

@ -40,7 +40,7 @@ export default class ModalRoot extends React.PureComponent {
this.setState({ revealed: false });
}
if (!nextProps.children && !!this.props.children) {
this.activeElement.focus();
this.activeElement.focus({ preventScroll: true });
this.activeElement = null;
}
}

1
app/javascript/flavours/glitch/styles/components/media.scss
View file

@ -147,6 +147,7 @@
position: relative;
z-index: 1;
object-fit: contain;
user-select: none;
&:not(.letterbox) {
height: 100%;