OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

pull/21833/head
Weblate 2018-05-17 16:05:41 +00:00
parent d9236a5848 fa7f6c2c4c
commit 04996887ec
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG.md
View File

@ -1,3 +1,10 @@
Changes in [0.12.5](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.5) (2018-05-17)
=====================================================================================================
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.4...v0.12.5)
* Fix image size jumping regression
[\#1909](https://github.com/matrix-org/matrix-react-sdk/pull/1909)
Changes in [0.12.4](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.4) (2018-05-16) Changes in [0.12.4](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.4) (2018-05-16)
===================================================================================================== =====================================================================================================
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.4-rc.6...v0.12.4) [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.4-rc.6...v0.12.4)

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "matrix-react-sdk", "name": "matrix-react-sdk",
"version": "0.12.4", "version": "0.12.5",
"description": "SDK for matrix.org using React", "description": "SDK for matrix.org using React",
"author": "matrix.org", "author": "matrix.org",
"repository": { "repository": {

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

@ -1,5 +1,6 @@
/* /*
Copyright 2015, 2016 OpenMarket Ltd Copyright 2015, 2016 OpenMarket Ltd
Copyright 2018 New Vector Ltd
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with 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() { onImageLoad() {
this.fixupHeight();
this.props.onWidgetLoad(); this.props.onWidgetLoad();
} }
@ -207,6 +207,7 @@ export default class extends React.Component {
}); });
}).done(); }).done();
} }
this.fixupHeight();
this._afterComponentDidMount(); this._afterComponentDidMount();
} }

1
src/components/views/messages/MStickerBody.js
View File

@ -40,7 +40,6 @@ export default class MStickerBody extends MImageBody {
} }
_onImageLoad() { _onImageLoad() {
this.fixupHeight();
this.setState({ this.setState({
placeholderClasses: 'mx_MStickerBody_placeholder_invisible', placeholderClasses: 'mx_MStickerBody_placeholder_invisible',
}); });