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

Prevent clicks on video from initiating selections

signup-info-prompt
Thibaut Girka 2018-09-17 14:19:35 +02:00 committed by ThibG
parent 5c9a2f5d77
commit 925c185ef9
2 changed files with 11 additions and 2 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

@ -78,6 +78,11 @@ 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;
@ -181,6 +186,7 @@ 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

7
app/javascript/flavours/glitch/features/video/index.js
View File

@ -135,7 +135,10 @@ export default class Video extends React.PureComponent {
this.seek = c; this.seek = c;
} }
handleClickRoot = e => e.stopPropagation(); handleMouseDownRoot = e => {
e.preventDefault();
e.stopPropagation();
}
handlePlay = () => { handlePlay = () => {
this.setState({ paused: false }); this.setState({ paused: false });
@ -319,7 +322,7 @@ export default class Video extends React.PureComponent {
ref={this.setPlayerRef} ref={this.setPlayerRef}
onMouseEnter={this.handleMouseEnter} onMouseEnter={this.handleMouseEnter}
onMouseLeave={this.handleMouseLeave} onMouseLeave={this.handleMouseLeave}
onClick={this.handleClickRoot} onMouseDown={this.handleMouseDownRoot}
tabIndex={0} tabIndex={0}
> >
<video <video