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

use JumpToBottomButton in RoomView

pull/21833/head
Bruno Windels 2019-01-22 14:50:16 +01:00
parent de4cda4572
commit 14592b5b57
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/components/structures/RoomView.js
View File

@ -1861,6 +1861,14 @@ module.exports = React.createClass({
onCloseClick={this.forgetReadMarker} onCloseClick={this.forgetReadMarker}
/>); />);
} }
let jumpToBottom;
if (!this.state.atEndOfLiveTimeline) {
const JumpToBottomButton = sdk.getComponent('rooms.JumpToBottomButton');
jumpToBottom = (<JumpToBottomButton
numUnreadMessages={this.state.numUnreadMessages}
onScrollToBottomClick={this.jumpToLiveTimeline}
/>);
}
const statusBarAreaClass = classNames( const statusBarAreaClass = classNames(
"mx_RoomView_statusArea", "mx_RoomView_statusArea",
{ {
@ -1898,6 +1906,7 @@ module.exports = React.createClass({
{ auxPanel } { auxPanel }
<div className="mx_RoomView_timeline"> <div className="mx_RoomView_timeline">
{ topUnreadMessagesBar } { topUnreadMessagesBar }
{ jumpToBottom }
{ messagePanel } { messagePanel }
{ searchResultsPanel } { searchResultsPanel }
</div> </div>