PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Don't try to use local echoes as scroll tokens

Browse source 
Local echoes don't have a (usable) event id, so don't use them when remembering
the scroll state of a room.
This commit is contained in:
Richard van der Hoff 2016-02-03 15:34:20 +00:00
parent 223675bafb
commit d7576d223d
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -995,8 +995,18 @@ module.exports = React.createClass({
var eventId = mxEv.getId(); var eventId = mxEv.getId();
var highlight = (eventId == this.props.highlightedEventId); var highlight = (eventId == this.props.highlightedEventId);
var scrollToken = eventId;
// we can't use local echoes as scroll tokens, because their event
// IDs change.
if (mxEv.status) {
scrollToken = undefined;
}
ret.push( ret.push(
<li key={eventId} ref={this._collectEventNode.bind(this, eventId)} data-scroll-token={eventId}> <li key={eventId}
ref={this._collectEventNode.bind(this, eventId)}
data-scroll-token={scrollToken}>
<EventTile mxEvent={mxEv} continuation={continuation} <EventTile mxEvent={mxEv} continuation={continuation}
last={last} isSelectedEvent={highlight}/> last={last} isSelectedEvent={highlight}/>
</li> </li>