autonomic-cooperative/hometown
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix audio attachments opening in video modal from media tab in web UI (#12056)

Browse Source 
Fix video attachments having a GIF label in media tab in web UI
This commit is contained in:
Eugen Rochko
2019-10-03 03:34:58 +02:00
committed by GitHub
parent 9184522cb4
commit c9b8ba50f8
7 changed files with 99 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/javascript/mastodon/features/account_gallery/components/media_item.js
View File

@ -119,6 +119,7 @@ export default class MediaItem extends ImmutablePureComponent {
);
} else if (['gifv', 'video'].indexOf(attachment.get('type')) !== -1) {
const autoPlay = !isIOS() && autoPlayGif;
const label = attachment.get('type') === 'video' ? <Icon id='play' /> : 'GIF';
thumbnail = (
<div className={classNames('media-gallery__gifv', { autoplay: autoPlay })}>
@ -135,7 +136,7 @@ export default class MediaItem extends ImmutablePureComponent {
muted
/>
<span className='media-gallery__gifv__label'>GIF</span>
<span className='media-gallery__gifv__label'>{label}</span>
</div>
);
}

4
app/javascript/mastodon/features/account_gallery/index.js
View File

@ -100,8 +100,10 @@ class AccountGallery extends ImmutablePureComponent {
}
handleOpenMedia = attachment => {
if (['video', 'audio'].includes(attachment.get('type'))) {
if (attachment.get('type') === 'video') {
this.props.dispatch(openModal('VIDEO', { media: attachment, status: attachment.get('status') }));
} else if (attachment.get('type') === 'audio') {
this.props.dispatch(openModal('AUDIO', { media: attachment, status: attachment.get('status') }));
} else {
const media = attachment.getIn(['status', 'media_attachments']);
const index = media.findIndex(x => x.get('id') === attachment.get('id'));