From e53497421e0d0a1974205821619676244ef28802 Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 17 May 2018 16:47:17 +0100 Subject: [PATCH] Fix image size jumping regression Fixes https://github.com/vector-im/riot-web/issues/6654 --- src/components/views/messages/MImageBody.js | 3 ++- src/components/views/messages/MStickerBody.js | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/views/messages/MImageBody.js b/src/components/views/messages/MImageBody.js index 6cc492acf8..f59b3a9e2c 100644 --- a/src/components/views/messages/MImageBody.js +++ b/src/components/views/messages/MImageBody.js @@ -1,5 +1,6 @@ /* Copyright 2015, 2016 OpenMarket Ltd +Copyright 2018 New Vector Ltd Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -140,7 +141,6 @@ export default class extends React.Component { } onImageLoad() { - this.fixupHeight(); this.props.onWidgetLoad(); } @@ -208,6 +208,7 @@ export default class extends React.Component { }).done(); } this._afterComponentDidMount(); + this.fixupHeight(); } // To be overridden by subclasses (e.g. MStickerBody) for further diff --git a/src/components/views/messages/MStickerBody.js b/src/components/views/messages/MStickerBody.js index 3a412fc2e2..aaad5ba75e 100644 --- a/src/components/views/messages/MStickerBody.js +++ b/src/components/views/messages/MStickerBody.js @@ -40,7 +40,6 @@ export default class MStickerBody extends MImageBody { } _onImageLoad() { - this.fixupHeight(); this.setState({ placeholderClasses: 'mx_MStickerBody_placeholder_invisible', });