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

Merge branch 'rav/roomview_works' into rav/read_marker

pull/21833/head
Richard van der Hoff 2016-02-23 18:56:11 +00:00
parent 029f47d91c 68e0192acc
commit 4f417f7a82
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/components/structures/MessagePanel.js
View File

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