Merge branch 'rav/roomview_works' into rav/read_marker

This commit is contained in:
Richard van der Hoff 2016-02-23 18:56:11 +00:00
commit 4f417f7a82

View file

@ -193,6 +193,7 @@ module.exports = React.createClass({
if (wantTile) {
ret.push(this._getTilesForEvent(prevEvent, mxEv, last));
prevEvent = mxEv;
} else if (!mxEv.status) {
// if we aren't showing the event, put in a dummy scroll token anyway, so
// that we can scroll to the right place.