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

Move saveScrollState into RoomView

Browse source 
It fits much more naturally here than in LoggedInView.
This commit is contained in:
Richard van der Hoff 2016-11-04 09:28:35 +00:00
parent f85a37c667
commit cb5b311e44
3 changed files with 37 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/components/structures/LoggedInView.js
View file

@ -54,36 +54,10 @@ export default React.createClass({
document.removeEventListener('keydown', this._onKeyDown);
},
componentWillReceiveProps: function(nextProps) {
if (nextProps.page_type !== this.props.page_type ||
nextProps.currentRoomAlias !== this.props.currentRoomAlias ||
nextProps.currentRoomId !== this.props.currentRoomId
) {
// stash the scroll state before we change view
this._updateScrollMap();
}
},
getScrollStateForRoom: function(roomId) {
return this._scrollStateMap[roomId];
},
// update scrollStateMap according to the current scroll state of the
// room view.
_updateScrollMap: function() {
if (!this.refs.roomView) {
return;
}
var roomview = this.refs.roomView;
var roomId = this.refs.roomView.getRoomId();
if (!roomId) {
return;
}
var state = roomview.getScrollState();
this._scrollStateMap[roomId] = state;
},
_onKeyDown: function(ev) {
/*
// Remove this for now as ctrl+alt = alt-gr so this breaks keyboards which rely on alt-gr for numbers
@ -170,6 +144,7 @@ export default React.createClass({
opacity={this.props.middleOpacity}
collapsedRhs={this.props.collapse_rhs}
ConferenceHandler={this.props.ConferenceHandler}
scrollStateMap={this._scrollStateMap}
/>
if (!this.props.collapse_rhs) right_panel = <RightPanel roomId={this.props.currentRoomId} opacity={this.props.sideOpacity} />
break;