mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-10-26 20:55:56 +03:00
Code Issues Projects Releases Packages Wiki 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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/components/structures/FilePanel.js
View file

@ -55,6 +55,7 @@ var FilePanel = React.createClass({
client.getOrCreateFilter("FILTER_FILES_" + client.credentials.userId, filter).then( client.getOrCreateFilter("FILTER_FILES_" + client.credentials.userId, filter).then(
(filterId)=>{ (filterId)=>{
filter.filterId = filterId;
var timelineSet = this.state.room.getOrCreateFilteredTimelineSet(filter); var timelineSet = this.state.room.getOrCreateFilteredTimelineSet(filter);
this.setState({ timelineSet: timelineSet }); this.setState({ timelineSet: timelineSet });
}, },
@ -93,6 +94,7 @@ var FilePanel = React.createClass({
if (this.state.timelineSet) { if (this.state.timelineSet) {
return ( return (
<TimelinePanel ref={this._gatherTimelinePanelRef} <TimelinePanel ref={this._gatherTimelinePanelRef}
className="mx_FilePanel"
manageReadReceipts={false} manageReadReceipts={false}
manageReadMarkers={false} manageReadMarkers={false}
timelineSet={this.state.timelineSet} timelineSet={this.state.timelineSet}

5
src/components/structures/MessagePanel.js
View file

@ -73,6 +73,9 @@ module.exports = React.createClass({
// opacity for dynamic UI fading effects // opacity for dynamic UI fading effects
opacity: React.PropTypes.number, opacity: React.PropTypes.number,
// className for the panel
className: React.PropTypes.string.isRequired,
}, },
componentWillMount: function() { componentWillMount: function() {
@ -503,7 +506,7 @@ module.exports = React.createClass({
style.opacity = this.props.opacity; style.opacity = this.props.opacity;
return ( return (
<ScrollPanel ref="scrollPanel" className="mx_RoomView_messagePanel mx_fadable" <ScrollPanel ref="scrollPanel" className={ this.props.className + " mx_fadable" }
onScroll={ this.props.onScroll } onScroll={ this.props.onScroll }
onResize={ this.onResize } onResize={ this.onResize }
onFillRequest={ this.props.onFillRequest } onFillRequest={ this.props.onFillRequest }

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

@ -1581,6 +1581,7 @@ module.exports = React.createClass({
onReadMarkerUpdated={ this._updateTopUnreadMessagesBar } onReadMarkerUpdated={ this._updateTopUnreadMessagesBar }
showUrlPreview = { this.state.showUrlPreview } showUrlPreview = { this.state.showUrlPreview }
opacity={ this.props.opacity } opacity={ this.props.opacity }
className="mx_RoomView_messagePanel"
/>); />);
var topUnreadMessagesBar = null; var topUnreadMessagesBar = null;

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