Revert some glitch-specific refactoring
In order to keep my sanity when porting changes between glitch-soc and upstream.remotes/1727458204337373841/tmp_refs/heads/signup-info-prompt
parent
d55ab8e3e8
commit
a95f8271be
|
@ -225,21 +225,35 @@ export default class MediaGallery extends React.PureComponent {
|
|||
this.props.onOpenMedia(this.props.media, index);
|
||||
}
|
||||
|
||||
isStandaloneEligible() {
|
||||
const { media, standalone } = this.props;
|
||||
return standalone && media.size === 1 && media.getIn([0, 'meta', 'small', 'aspect']);
|
||||
}
|
||||
|
||||
render () {
|
||||
const {
|
||||
handleClick,
|
||||
handleOpen,
|
||||
} = this;
|
||||
const {
|
||||
fullwidth,
|
||||
intl,
|
||||
letterbox,
|
||||
media,
|
||||
sensitive,
|
||||
standalone,
|
||||
} = this.props;
|
||||
const { media, intl, sensitive, letterbox, fullwidth } = this.props;
|
||||
const { visible } = this.state;
|
||||
const size = media.take(4).size;
|
||||
|
||||
let children;
|
||||
|
||||
if (!visible) {
|
||||
let warning = <FormattedMessage {...(sensitive ? messages.warning : messages.hidden)} />;
|
||||
|
||||
children = (
|
||||
<button className='media-spoiler' type='button' onClick={this.handleOpen}>
|
||||
<span className='media-spoiler__warning'>{warning}</span>
|
||||
<span className='media-spoiler__trigger'><FormattedMessage {...messages.toggle} /></span>
|
||||
</button>
|
||||
);
|
||||
} else {
|
||||
if (this.isStandaloneEligible()) {
|
||||
children = <Item standalone attachment={media.get(0)} onClick={this.handleClick} />;
|
||||
} else {
|
||||
children = media.take(4).map((attachment, i) => <Item key={attachment.get('id')} onClick={this.handleClick} attachment={attachment} index={i} size={size} letterbox={letterbox} />);
|
||||
}
|
||||
}
|
||||
|
||||
const computedClass = classNames('media-gallery', `size-${size}`, { 'full-width': fullwidth });
|
||||
|
||||
return (
|
||||
|
@ -248,7 +262,7 @@ export default class MediaGallery extends React.PureComponent {
|
|||
<div className='sensitive-info'>
|
||||
<IconButton
|
||||
icon='eye'
|
||||
onClick={handleOpen}
|
||||
onClick={this.handleOpen}
|
||||
overlay
|
||||
title={intl.formatMessage(messages.toggle_visible)}
|
||||
/>
|
||||
|
@ -259,46 +273,8 @@ export default class MediaGallery extends React.PureComponent {
|
|||
) : null}
|
||||
</div>
|
||||
) : null}
|
||||
{function () {
|
||||
switch (true) {
|
||||
case !visible:
|
||||
return (
|
||||
<button
|
||||
className='media-spoiler'
|
||||
type='button'
|
||||
onClick={handleOpen}
|
||||
>
|
||||
<span className='media-spoiler__warning'>
|
||||
<FormattedMessage {...(sensitive ? messages.warning : messages.hidden)} />
|
||||
</span>
|
||||
<span className='media-spoiler__trigger'>
|
||||
<FormattedMessage {...messages.toggle} />
|
||||
</span>
|
||||
</button>
|
||||
);
|
||||
case standalone && media.size === 1 && !!media.getIn([0, 'meta', 'small', 'aspect']):
|
||||
return (
|
||||
<Item
|
||||
attachment={media.get(0)}
|
||||
onClick={handleClick}
|
||||
standalone
|
||||
/>
|
||||
);
|
||||
default:
|
||||
return media.take(4).map(
|
||||
(attachment, i) => (
|
||||
<Item
|
||||
attachment={attachment}
|
||||
index={i}
|
||||
key={attachment.get('id')}
|
||||
letterbox={letterbox}
|
||||
onClick={handleClick}
|
||||
size={size}
|
||||
/>
|
||||
)
|
||||
);
|
||||
}
|
||||
}()}
|
||||
|
||||
{children}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue