ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix opening/closing gifv sometimes making the timeline scroll

rebase/4.0.0rc2
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(); e.stopPropagation();
} }
handleMouseDown = (e) => {
e.preventDefault();
e.stopPropagation();
}
render () { render () {
const { attachment, index, size, standalone, letterbox, displayWidth } = this.props; const { attachment, index, size, standalone, letterbox, displayWidth } = this.props;
@ -190,7 +185,6 @@ class Item extends React.PureComponent {
onClick={this.handleClick} onClick={this.handleClick}
onMouseEnter={this.handleMouseEnter} onMouseEnter={this.handleMouseEnter}
onMouseLeave={this.handleMouseLeave} onMouseLeave={this.handleMouseLeave}
onMouseDown={this.handleMouseDown}
autoPlay={autoPlay} autoPlay={autoPlay}
loop loop
muted 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 }); this.setState({ revealed: false });
} }
if (!nextProps.children && !!this.props.children) { if (!nextProps.children && !!this.props.children) {
this.activeElement.focus(); this.activeElement.focus({ preventScroll: true });
this.activeElement = null; this.activeElement = null;
} }
} }

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

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