fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-17 15:35:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only compute height dynamically for standalone media

Browse source 
This prevents changing the status' height and triggering jumps in the TL
This commit is contained in:
Thibaut Girka 2018-04-15 20:58:24 +02:00
parent 52229405ed
commit 779aa707ec
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/javascript/flavours/glitch/components/media_gallery.js
View file

@ -238,7 +238,7 @@ export default class MediaGallery extends React.PureComponent {
} }
handleRef = (node) => { handleRef = (node) => {
if (node /*&& this.isStandaloneEligible()*/) { if (node && this.isStandaloneEligible()) {
// offsetWidth triggers a layout, so only calculate when we need to // offsetWidth triggers a layout, so only calculate when we need to
this.setState({ this.setState({
width: node.offsetWidth, width: node.offsetWidth,
@ -260,13 +260,9 @@ export default class MediaGallery extends React.PureComponent {
const style = {}; const style = {};
if (this.isStandaloneEligible()) { if (this.isStandaloneEligible() && width) {
if (width) {
style.height = width / this.props.media.getIn([0, 'meta', 'small', 'aspect']); style.height = width / this.props.media.getIn([0, 'meta', 'small', 'aspect']);
} }
} else if (width) {
style.height = width / (16/9);
}
if (!visible) { if (!visible) {
let warning = <FormattedMessage {...(sensitive ? messages.warning : messages.hidden)} />; let warning = <FormattedMessage {...(sensitive ? messages.warning : messages.hidden)} />;