AkkomaGang/fedibird-fe
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity

Fix PictureInPicture to work in quotes

Browse source
This commit is contained in:
noellabo 2020-10-07 22:28:02 +09:00
parent 9be377319f
commit e9ee34d3f4
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/javascript/mastodon/components/status.js
View file

@ -381,10 +381,10 @@ class Status extends ImmutablePureComponent {
status = status.get('reblog'); status = status.get('reblog');
} }
if (pictureInPicture.get('inUse')) { if (status.get('media_attachments').size > 0) {
media = <PictureInPicturePlaceholder width={this.props.cachedMediaWidth} />; if (pictureInPicture.get('inUse')) {
} else if (status.get('media_attachments').size > 0) { media = <PictureInPicturePlaceholder width={this.props.cachedMediaWidth} />;
if (this.props.muted) { } else if (this.props.muted) {
media = ( media = (
<AttachmentList <AttachmentList
compact compact
@ -492,7 +492,9 @@ class Status extends ImmutablePureComponent {
let quote_media = null; let quote_media = null;
if (quote_status.get('media_attachments').size > 0) { if (quote_status.get('media_attachments').size > 0) {
if (this.props.muted) { if (pictureInPicture.get('inUse')) {
quote_media = <PictureInPicturePlaceholder width={this.props.cachedMediaWidth} />;
} else if (this.props.muted) {
quote_media = ( quote_media = (
<AttachmentList <AttachmentList
compact compact
@ -516,7 +518,8 @@ class Status extends ImmutablePureComponent {
width={this.props.cachedMediaWidth} width={this.props.cachedMediaWidth}
height={70} height={70}
cacheWidth={this.props.cacheMediaWidth} cacheWidth={this.props.cacheMediaWidth}
/> deployPictureInPicture={pictureInPicture.get('available') ? this.handleDeployPictureInPicture : undefined}
/>
)} )}
</Bundle> </Bundle>
); );
@ -537,6 +540,7 @@ class Status extends ImmutablePureComponent {
sensitive={quote_status.get('sensitive')} sensitive={quote_status.get('sensitive')}
onOpenVideo={this.handleOpenVideo} onOpenVideo={this.handleOpenVideo}
cacheWidth={this.props.cacheMediaWidth} cacheWidth={this.props.cacheMediaWidth}
deployPictureInPicture={pictureInPicture.get('available') ? this.handleDeployPictureInPicture : undefined}
visible={this.state.showQuoteMedia} visible={this.state.showQuoteMedia}
onToggleVisibility={this.handleToggleQuoteMediaVisibility} onToggleVisibility={this.handleToggleQuoteMediaVisibility}
quote quote