matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-06-23 05:41:39 +03:00
Code Activity

marker -> event_id

Browse Source
This commit is contained in:
Luke Barnard
2017-04-18 15:13:05 +01:00
parent 4b5364e9ae
commit d33afa99ab
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/structures/TimelinePanel.js
View File

@ -122,7 +122,7 @@ var TimelinePanel = React.createClass({
if (this.props.manageReadMarkers) { if (this.props.manageReadMarkers) {
const readmarker = this.props.timelineSet.room.getAccountData('m.fully_read'); const readmarker = this.props.timelineSet.room.getAccountData('m.fully_read');
if (readmarker){ if (readmarker){
initialReadMarker = readmarker.getContent().marker; initialReadMarker = readmarker.getContent().event_id;
} else { } else {
initialReadMarker = this._getCurrentReadReceipt(); initialReadMarker = this._getCurrentReadReceipt();
} }
@ -478,7 +478,7 @@ var TimelinePanel = React.createClass({
if (ev.getType() !== "m.fully_read") return; if (ev.getType() !== "m.fully_read") return;
const markerEventId = ev.getContent().marker; const markerEventId = ev.getContent().event_id;
console.log('TimelinePanel: Read marker received from server', markerEventId); console.log('TimelinePanel: Read marker received from server', markerEventId);
this.setState({ this.setState({
@ -1045,7 +1045,6 @@ var TimelinePanel = React.createClass({
// events when viewing historical messages, we get stuck in a loop // events when viewing historical messages, we get stuck in a loop
// of paginating our way through the entire history of the room. // of paginating our way through the entire history of the room.
var stickyBottom = !this._timelineWindow.canPaginate(EventTimeline.FORWARDS); var stickyBottom = !this._timelineWindow.canPaginate(EventTimeline.FORWARDS);
return ( return (
<MessagePanel ref="messagePanel" <MessagePanel ref="messagePanel"
hidden={ this.props.hidden } hidden={ this.props.hidden }