matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-07-16 22:01:54 +03:00
Code Activity

apply FilePanel css and fix filtering

Browse Source
This commit is contained in:
Matthew Hodgson
2016-09-07 02:16:29 +01:00
parent c2f2fb3816
commit e7074ef9af
4 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/structures/TimelinePanel.js
View File

@ -90,6 +90,9 @@ var TimelinePanel = React.createClass({
// maximum number of events to show in a timeline
timelineCap: React.PropTypes.number,
// classname to use for the messagepanel
className: React.PropTypes.string.isRequired,
},
statics: {
@ -827,7 +830,7 @@ var TimelinePanel = React.createClass({
// if we're at the end of the live timeline, append the pending events
if (!this._timelineWindow.canPaginate(EventTimeline.FORWARDS)) {
events.push(... this.props.timelineSet.room.getPendingEvents());
events.push(... this.props.timelineSet.getPendingEvents());
}
return events;
@ -941,7 +944,7 @@ var TimelinePanel = React.createClass({
// exist.
if (this.state.timelineLoading) {
return (
<div className="mx_RoomView_messagePanel mx_RoomView_messageListWrapper">
<div className={ this.props.className + " mx_RoomView_messageListWrapper" }>
<Loader />
</div>
);
@ -973,6 +976,7 @@ var TimelinePanel = React.createClass({
onScroll={ this.onMessageListScroll }
onFillRequest={ this.onMessageListFillRequest }
opacity={ this.props.opacity }
className={ this.props.className }
/>
);
},