treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Fix video player offering to expand in a lightbox when it's in an iframe (#25067)

pull/62/head
Claire 2023-05-23 14:28:21 +02:00 committed by GitHub
parent 9017df7178
commit 100840c06e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/javascript/mastodon/containers/media_container.jsx
View File

@ -73,6 +73,13 @@ export default class MediaContainer extends PureComponent {
render () { render () {
const { locale, components } = this.props; const { locale, components } = this.props;
let handleOpenVideo;
// Don't offer to expand the video in a lightbox if we're in a frame
if (window.self === window.top) {
handleOpenVideo = this.handleOpenVideo;
}
return ( return (
<IntlProvider locale={locale} messages={messages}> <IntlProvider locale={locale} messages={messages}>
<> <>
@ -89,7 +96,7 @@ export default class MediaContainer extends PureComponent {
...(componentName === 'Video' ? { ...(componentName === 'Video' ? {
componentIndex: i, componentIndex: i,
onOpenVideo: this.handleOpenVideo, onOpenVideo: handleOpenVideo,
} : { } : {
onOpenMedia: this.handleOpenMedia, onOpenMedia: this.handleOpenMedia,
}), }),