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

Remove redundant code

pull/21833/head
David Baker 2017-09-08 13:39:22 +01:00
parent d714291aa1
commit 59c54d3756
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/components/structures/RoomView.js
View File

@ -191,14 +191,8 @@ module.exports = React.createClass({
newState.room = MatrixClientPeg.get().getRoom(newState.roomId);
}
if (this.state.roomId !== newState.roomId) {
// Store the scroll state for the previous room so that we can return to this
// position when viewing this room in future.
if (this.state.roomId) {
RoomScrollStateStore.setScrollState(this.state.roomId, this._getScrollState());
}
// ...and get the scroll state for the new room
if (this.state.roomId === null && newState.roomId !== null) {
// Get the scroll state for the new room
// If an event ID wasn't specified, default to the one saved for this room
// in the scroll state store. Assume initialEventPixelOffset should be set.
@ -354,7 +348,9 @@ module.exports = React.createClass({
this.unmounted = true;
// update the scroll map before we get unmounted
RoomScrollStateStore.setScrollState(this.state.roomId, this._getScrollState());
if (this.state.roomId) {
RoomScrollStateStore.setScrollState(this.state.roomId, this._getScrollState());
}
if (this.refs.roomView) {
// disconnect the D&D event listeners from the room view. This