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

Merge pull request #208 from matrix-org/rav/missing_date_separator

Browse source 
Fix the missing date separator at the start of rooms
This commit is contained in:
Richard van der Hoff 2016-03-10 14:19:52 +00:00
commit a841991952
1 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -188,7 +188,7 @@ var TimelinePanel = React.createClass({
debuglog("TimelinePanel: paginate complete backwards:"+backwards+"; success:"+r); debuglog("TimelinePanel: paginate complete backwards:"+backwards+"; success:"+r);
this.setState({[statekey]: false}); this.setState({[statekey]: false});
this._onTimelineUpdated(r); this._onTimelineUpdated();
return r; return r;
}); });
}, },
@ -555,7 +555,7 @@ var TimelinePanel = React.createClass({
// calling _onTimelineUpdated and updating the state. // calling _onTimelineUpdated and updating the state.
var onLoaded = () => { var onLoaded = () => {
this._onTimelineUpdated(true); this._onTimelineUpdated();
this.setState({timelineLoading: false}, () => { this.setState({timelineLoading: false}, () => {
// initialise the scroll state of the message panel // initialise the scroll state of the message panel
@ -586,17 +586,15 @@ var TimelinePanel = React.createClass({
prom.done(); prom.done();
}, },
_onTimelineUpdated: function(gotResults) { _onTimelineUpdated: function() {
// we might have switched rooms since the load started - just bin // we might have switched rooms since the load started - just bin
// the results if so. // the results if so.
if (this.unmounted) return; if (this.unmounted) return;
if (gotResults) {
this.setState({ this.setState({
events: this._timelineWindow.getEvents(), events: this._timelineWindow.getEvents(),
canBackPaginate: this._timelineWindow.canPaginate(EventTimeline.BACKWARDS), canBackPaginate: this._timelineWindow.canPaginate(EventTimeline.BACKWARDS),
}); });
}
}, },
_indexForEventId: function(evId) { _indexForEventId: function(evId) {