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

Rename RVS state (event -> initialEvent) and redocument

Browse source
This commit is contained in:
Luke Barnard 2017-06-08 15:47:41 +01:00
parent 1792fa45f4
commit 000a045e35
2 changed files with 29 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -165,14 +165,14 @@ module.exports = React.createClass({
roomLoading: RoomViewStore.isRoomLoading(),
roomLoadError: RoomViewStore.getRoomLoadError(),
joining: RoomViewStore.isJoining(),
eventId: RoomViewStore.getEventId(),
eventPixelOffset: RoomViewStore.getEventPixelOffset(),
isEventHighlighted: RoomViewStore.isEventHighlighted(),
initialEventId: RoomViewStore.getInitialEventId(),
initialEventPixelOffset: RoomViewStore.getInitialEventPixelOffset(),
isInitialEventHighlighted: RoomViewStore.isInitialEventHighlighted(),
};
// Clear the search results when clicking a search result (which changes the
// currently scrolled to event, this.state.eventId).
if (this.state.eventId !== newState.eventId) {
// currently scrolled to event, this.state.initialEventId).
if (this.state.initialEventId !== newState.initialEventId) {
newState.searchResults = null;
}
@ -1665,12 +1665,12 @@ module.exports = React.createClass({
hideMessagePanel = true;
}
const shouldHighlight = this.state.isEventHighlighted;
const shouldHighlight = this.state.isInitialEventHighlighted;
let highlightedEventId = null;
if (this.state.forwardingEvent) {
highlightedEventId = this.state.forwardingEvent.getId();
} else if (shouldHighlight) {
highlightedEventId = this.state.eventId;
highlightedEventId = this.state.initialEventId;
}
// console.log("ShowUrlPreview for %s is %s", this.state.room.roomId, this.state.showUrlPreview);
@ -1681,8 +1681,8 @@ module.exports = React.createClass({
manageReadMarkers={true}
hidden={hideMessagePanel}
highlightedEventId={highlightedEventId}
eventId={this.state.eventId}
eventPixelOffset={this.state.eventPixelOffset}
eventId={this.state.initialEventId}
eventPixelOffset={this.state.initialEventPixelOffset}
onScroll={ this.onMessageListScroll }
onReadMarkerUpdated={ this._updateTopUnreadMessagesBar }
showUrlPreview = { this.state.showUrlPreview }