treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Only compute height dynamically for standalone media 

This prevents changing the status' height and triggering jumps in the TL
lolsob-rspec
Thibaut Girka 2018-04-15 20:58:24 +02:00
parent 46b36c44ce
commit 9b72f23fdd
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)} />;