Merge pull request #594 from matrix-org/luke/fix-scroll-jump-on-video-decryption

Fix scroll jumping when a video is decrypted
This commit is contained in:
Richard van der Hoff 2016-12-20 12:41:39 +00:00 committed by GitHub
commit a014dcc2d0

View file

@ -27,6 +27,14 @@ import q from 'q';
module.exports = React.createClass({
displayName: 'MVideoBody',
propTypes: {
/* the MatrixEvent to show */
mxEvent: React.PropTypes.object.isRequired,
/* called when the video has loaded */
onWidgetLoad: React.PropTypes.func.isRequired,
},
getInitialState: function() {
return {
decryptedUrl: null,
@ -100,6 +108,7 @@ module.exports = React.createClass({
decryptedThumbnailUrl: thumbnailUrl,
decryptedBlob: decryptedBlob,
});
this.props.onWidgetLoad();
});
}).catch((err) => {
console.warn("Unable to decrypt attachment: ", err)