Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-16 21:24:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix scroll jump on image decryption

Browse Source 
`onWidgetLoad` is now being called when an image has been decrypted so that the ScrollPanel maintains its scroll position (whether it's stuckAtBottom or not). This attempts to fix https://github.com/vector-im/riot-web/issues/2624
This commit is contained in:
Luke Barnard 2016-12-02 11:11:35 +00:00
parent 3aa1e0dd9e
commit 5665a0ef37
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/components/views/messages/MImageBody.js
View File

@ -32,6 +32,9 @@ module.exports = React.createClass({
propTypes: { propTypes: {
/* the MatrixEvent to show */ /* the MatrixEvent to show */
mxEvent: React.PropTypes.object.isRequired, mxEvent: React.PropTypes.object.isRequired,
/* called when the image has loaded */
onWidgetLoad: React.PropTypes.func.isRequired,
}, },
getInitialState: function() { getInitialState: function() {
@ -123,6 +126,7 @@ module.exports = React.createClass({
decryptedUrl: contentUrl, decryptedUrl: contentUrl,
decryptedThumbnailUrl: thumbnailUrl, decryptedThumbnailUrl: thumbnailUrl,
}); });
this.props.onWidgetLoad();
}); });
}).catch((err) => { }).catch((err) => {
console.warn("Unable to decrypt attachment: ", err); console.warn("Unable to decrypt attachment: ", err);
@ -186,11 +190,12 @@ module.exports = React.createClass({
<span className="mx_MImageBody" ref="body"> <span className="mx_MImageBody" ref="body">
<div className="mx_MImageBody_thumbnail" ref="image" style={{ <div className="mx_MImageBody_thumbnail" ref="image" style={{
"display": "flex", "display": "flex",
"align-items": "center", "alignItems": "center",
"justify-items": "center",
"width": "100%", "width": "100%",
}}> }}>
<img src="img/spinner.gif" alt={content.body} width="16" height="16"/> <img src="img/spinner.gif" alt={content.body} width="32" height="32" style={{
"margin": "auto",
}}/>
</div> </div>
</span> </span>
); );