imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Richard van der Hoff 2016-02-23 13:37:21 +00:00
commit d599c8fbd2
2 changed files with 47 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/components/structures/RoomView.js
View file

@ -1014,9 +1014,10 @@ module.exports = React.createClass({
},
onChildResize: function() {
// When the video or the message composer resizes, the scroll panel
// also changes size. Work around GeminiScrollBar fail by telling it
// about it. This also ensures that the scroll offset is updated.
// When the video, status bar, or the message composer resizes, the
// scroll panel also changes size. Work around GeminiScrollBar fail by
// telling it about it. This also ensures that the scroll offset is
// updated.
if (this.refs.messagePanel) {
this.refs.messagePanel.forceUpdate();
}
@ -1147,6 +1148,7 @@ module.exports = React.createClass({
hasActiveCall={inCall}
onResendAllClick={this.onResendAllClick}
onScrollToBottomClick={this.jumpToLiveTimeline}
onResize={this.onChildResize}
/>
}