djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2024-11-28 19:10:22 -05:00
Code Issues Packages Projects Releases Wiki Activity

[Glitch] Use real container width in MediaGallery srcSet

Browse Source 
Port 22e067bf5c to glitch-soc
This commit is contained in:
Thibaut Girka 2018-05-21 17:55:07 +02:00
parent 463078dcc4
commit 3ad3cee44c
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/javascript/flavours/glitch/components/media_gallery.js
View File

@ -40,6 +40,7 @@ class Item extends React.PureComponent {
size: PropTypes.number.isRequired, size: PropTypes.number.isRequired,
letterbox: PropTypes.bool, letterbox: PropTypes.bool,
onClick: PropTypes.func.isRequired, onClick: PropTypes.func.isRequired,
displayWidth: PropTypes.number,
}; };
static defaultProps = { static defaultProps = {
@ -78,7 +79,7 @@ class Item extends React.PureComponent {
} }
render () { render () {
const { attachment, index, size, standalone, letterbox } = this.props; const { attachment, index, size, standalone, letterbox, displayWidth } = this.props;
let width = 50; let width = 50;
let height = 100; let height = 100;
@ -141,7 +142,7 @@ class Item extends React.PureComponent {
const hasSize = typeof originalWidth === 'number' && typeof previewWidth === 'number'; const hasSize = typeof originalWidth === 'number' && typeof previewWidth === 'number';
const srcSet = hasSize ? `${originalUrl} ${originalWidth}w, ${previewUrl} ${previewWidth}w` : null; const srcSet = hasSize ? `${originalUrl} ${originalWidth}w, ${previewUrl} ${previewWidth}w` : null;
const sizes = hasSize ? `(min-width: 1025px) ${320 * (width / 100)}px, ${width}vw` : null; const sizes = hasSize ? `${displayWidth * (width / 100)}px` : null;
const focusX = attachment.getIn(['meta', 'focus', 'x']) || 0; const focusX = attachment.getIn(['meta', 'focus', 'x']) || 0;
const focusY = attachment.getIn(['meta', 'focus', 'y']) || 0; const focusY = attachment.getIn(['meta', 'focus', 'y']) || 0;
@ -272,9 +273,9 @@ export default class MediaGallery extends React.PureComponent {
); );
} else { } else {
if (this.isStandaloneEligible()) { if (this.isStandaloneEligible()) {
children = <Item standalone attachment={media.get(0)} onClick={this.handleClick} />; children = <Item standalone attachment={media.get(0)} onClick={this.handleClick} displayWidth={width} />;
} else { } else {
children = media.take(4).map((attachment, i) => <Item key={attachment.get('id')} onClick={this.handleClick} attachment={attachment} index={i} size={size} letterbox={letterbox} />); children = media.take(4).map((attachment, i) => <Item key={attachment.get('id')} onClick={this.handleClick} attachment={attachment} index={i} size={size} letterbox={letterbox} displayWidth={width} />);
} }
} }