gearheads
/
mastodon
Archived
2
0
Fork 0
Code Releases 4 Activity

Add "not available" label on unknown media attachments (#11715)

gh/stable
Eugen Rochko 2019-09-01 19:43:35 +02:00 committed by GitHub
parent 59b013df5f
commit d344289431
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/javascript/mastodon/components/media_gallery.js
View File

@ -315,15 +315,22 @@ class MediaGallery extends React.PureComponent {
style.height = height; style.height = height;
} }
const size = media.take(4).size; const size = media.take(4).size;
const uncached = media.every(attachment => attachment.get('type') === 'unknown');
if (this.isStandaloneEligible()) { if (this.isStandaloneEligible()) {
children = <Item standalone onClick={this.handleClick} attachment={media.get(0)} displayWidth={width} visible={visible} />; children = <Item standalone onClick={this.handleClick} attachment={media.get(0)} displayWidth={width} visible={visible} />;
} else { } else {
children = media.take(4).map((attachment, i) => <Item key={attachment.get('id')} onClick={this.handleClick} attachment={attachment} index={i} size={size} displayWidth={width} visible={visible} />); children = media.take(4).map((attachment, i) => <Item key={attachment.get('id')} onClick={this.handleClick} attachment={attachment} index={i} size={size} displayWidth={width} visible={visible || uncached} />);
} }
if (visible) { if (uncached) {
spoilerButton = (
<button type='button' disabled className='spoiler-button__overlay'>
<span className='spoiler-button__overlay__label'><FormattedMessage id='status.uncached_media_warning' defaultMessage='Not available' /></span>
</button>
);
} else if (visible) {
spoilerButton = <IconButton title={intl.formatMessage(messages.toggle_visible)} icon='eye-slash' overlay onClick={this.handleOpen} />; spoilerButton = <IconButton title={intl.formatMessage(messages.toggle_visible)} icon='eye-slash' overlay onClick={this.handleOpen} />;
} else { } else {
spoilerButton = ( spoilerButton = (
@ -335,7 +342,7 @@ class MediaGallery extends React.PureComponent {
return ( return (
<div className='media-gallery' style={style} ref={this.handleRef}> <div className='media-gallery' style={style} ref={this.handleRef}>
<div className={classNames('spoiler-button', { 'spoiler-button--minified': visible })}> <div className={classNames('spoiler-button', { 'spoiler-button--minified': visible && !uncached })}>
{spoilerButton} {spoilerButton}
</div> </div>

8
app/javascript/styles/mastodon/components.scss
View File

@ -3477,6 +3477,14 @@ a.status-card.compact:hover {
background: rgba($base-overlay-background, 0.8); background: rgba($base-overlay-background, 0.8);
} }
} }
&:disabled {
cursor: not-allowed;
.spoiler-button__overlay__label {
background: rgba($base-overlay-background, 0.5);
}
}
} }
} }