mirrors
/
glitch-social
mirror of https://github.com/glitch-soc/mastodon
1
0
Fork 0
Code Releases Activity

Fix uncached media in web UI not being clickable (#11745)

This commit is contained in:
Eugen Rochko 2019-09-03 04:56:40 +02:00 committed by GitHub
parent 5466b39c78
commit 34adc8784a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -159,7 +159,7 @@ class Item extends React.PureComponent {
if (attachment.get('type') === 'unknown') { if (attachment.get('type') === 'unknown') {
return ( return (
<div className={classNames('media-gallery__item', { standalone })} key={attachment.get('id')} style={{ left: left, top: top, right: right, bottom: bottom, width: `${width}%`, height: `${height}%` }}> <div className={classNames('media-gallery__item', { standalone })} key={attachment.get('id')} style={{ left: left, top: top, right: right, bottom: bottom, width: `${width}%`, height: `${height}%` }}>
<a className='media-gallery__item-thumbnail' href={attachment.get('remote_url')} target='_blank' style={{ cursor: 'pointer' }} title={attachment.get('description')}> <a className='media-gallery__item-thumbnail' href={attachment.get('remote_url') || attachment.get('url')} target='_blank' style={{ cursor: 'pointer' }} title={attachment.get('description')}>
<canvas width={32} height={32} ref={this.setCanvasRef} className='media-gallery__preview' /> <canvas width={32} height={32} ref={this.setCanvasRef} className='media-gallery__preview' />
</a> </a>
</div> </div>
@ -342,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 && !uncached })}> <div className={classNames('spoiler-button', { 'spoiler-button--minified': visible && !uncached, 'spoiler-button--click-thru': uncached })}>
{spoilerButton} {spoilerButton}
</div> </div>

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

@ -3449,6 +3449,10 @@ a.status-card.compact:hover {
height: auto; height: auto;
} }
&--click-thru {
pointer-events: none;
}
&--hidden { &--hidden {
display: none; display: none;
} }
@ -3479,8 +3483,6 @@ a.status-card.compact:hover {
} }
&:disabled { &:disabled {
cursor: not-allowed;
.spoiler-button__overlay__label { .spoiler-button__overlay__label {
background: rgba($base-overlay-background, 0.5); background: rgba($base-overlay-background, 0.5);
} }