From 779aa707ecefd96fe72188ca836de02ad25c5fa5 Mon Sep 17 00:00:00 2001 From: Thibaut Girka Date: Sun, 15 Apr 2018 20:58:24 +0200 Subject: [PATCH] Only compute height dynamically for standalone media This prevents changing the status' height and triggering jumps in the TL --- .../flavours/glitch/components/media_gallery.js | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/app/javascript/flavours/glitch/components/media_gallery.js b/app/javascript/flavours/glitch/components/media_gallery.js index 85949d49d1..5169ead5aa 100644 --- a/app/javascript/flavours/glitch/components/media_gallery.js +++ b/app/javascript/flavours/glitch/components/media_gallery.js @@ -238,7 +238,7 @@ export default class MediaGallery extends React.PureComponent { } handleRef = (node) => { - if (node /*&& this.isStandaloneEligible()*/) { + if (node && this.isStandaloneEligible()) { // offsetWidth triggers a layout, so only calculate when we need to this.setState({ width: node.offsetWidth, @@ -260,12 +260,8 @@ export default class MediaGallery extends React.PureComponent { const style = {}; - if (this.isStandaloneEligible()) { - if (width) { - style.height = width / this.props.media.getIn([0, 'meta', 'small', 'aspect']); - } - } else if (width) { - style.height = width / (16/9); + if (this.isStandaloneEligible() && width) { + style.height = width / this.props.media.getIn([0, 'meta', 'small', 'aspect']); } if (!visible) {