diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2018-10-29 04:42:07 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-29 04:42:07 +0100 |
commit | 9c38c5daa3d7298f02c763a84a74680dcc89dac2 (patch) | |
tree | 65690a069a71c12ab68d63e10a698a23b37c0f9f /app/javascript/mastodon/features/status/components/card.js | |
parent | 26fe37c41460d6db3b5dd975a86c14fdd8dfadf3 (diff) |
Fix dimensions of preview cards, fix crash in web UI, fix warning (#9133)
Diffstat (limited to 'app/javascript/mastodon/features/status/components/card.js')
-rw-r--r-- | app/javascript/mastodon/features/status/components/card.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/javascript/mastodon/features/status/components/card.js b/app/javascript/mastodon/features/status/components/card.js index 9a87f7a3f..743fe779a 100644 --- a/app/javascript/mastodon/features/status/components/card.js +++ b/app/javascript/mastodon/features/status/components/card.js @@ -59,7 +59,7 @@ export default class Card extends React.PureComponent { card: ImmutablePropTypes.map, maxDescription: PropTypes.number, onOpenMedia: PropTypes.func.isRequired, - compact: PropTypes.boolean, + compact: PropTypes.bool, }; static defaultProps = { @@ -120,7 +120,7 @@ export default class Card extends React.PureComponent { const content = { __html: addAutoPlay(card.get('html')) }; const { width } = this.state; const ratio = card.get('width') / card.get('height'); - const height = card.get('width') > card.get('height') ? (width / ratio) : (width * ratio); + const height = width / ratio; return ( <div @@ -145,8 +145,8 @@ export default class Card extends React.PureComponent { const interactive = card.get('type') !== 'link'; const className = classnames('status-card', { horizontal, compact, interactive }); const title = interactive ? <a className='status-card__title' href={card.get('url')} title={card.get('title')} rel='noopener' target='_blank'><strong>{card.get('title')}</strong></a> : <strong className='status-card__title' title={card.get('title')}>{card.get('title')}</strong>; - const ratio = compact ? 16 / 9 : card.get('width') / card.get('height'); - const height = card.get('width') > card.get('height') ? (width / ratio) : (width * ratio); + const ratio = card.get('width') / card.get('height'); + const height = (compact && !embedded) ? (width / (16 / 9)) : (width / ratio); const description = ( <div className='status-card__content'> |