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

Rename vars, linting

pull/21833/head
Luke Barnard 2017-05-10 14:51:47 +01:00
parent 30e183a7f1
commit fe8ea4ffe7
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -177,8 +177,8 @@ var TimelinePanel = React.createClass({
componentWillMount: function() { componentWillMount: function() {
debuglog("TimelinePanel: mounting"); debuglog("TimelinePanel: mounting");
this.last_rr_sent_event_id = undefined; this.lastRRSentSentId = undefined;
this.last_rm_sent_event_id = undefined; this.lastRMSentEventId = undefined;
this.dispatcherRef = dis.register(this.onAction); this.dispatcherRef = dis.register(this.onAction);
MatrixClientPeg.get().on("Room.timeline", this.onRoomTimeline); MatrixClientPeg.get().on("Room.timeline", this.onRoomTimeline);
@ -509,8 +509,8 @@ var TimelinePanel = React.createClass({
let shouldSendReadReceipt = true; let shouldSendReadReceipt = true;
var currentReadUpToEventId = this._getCurrentReadReceipt(true); const currentReadUpToEventId = this._getCurrentReadReceipt(true);
var currentReadUpToEventIndex = this._indexForEventId(currentReadUpToEventId); const currentReadUpToEventIndex = this._indexForEventId(currentReadUpToEventId);
// We want to avoid sending out read receipts when we are looking at // We want to avoid sending out read receipts when we are looking at
// events in the past which are before the latest RR. // events in the past which are before the latest RR.
// //
@ -529,33 +529,33 @@ var TimelinePanel = React.createClass({
shouldSendReadReceipt = false; shouldSendReadReceipt = false;
} }
var lastReadEventIndex = this._getLastDisplayedEventIndex({ const lastReadEventIndex = this._getLastDisplayedEventIndex({
ignoreOwn: true ignoreOwn: true,
}); });
if (lastReadEventIndex === null) { if (lastReadEventIndex === null) {
shouldSendReadReceipt = false; shouldSendReadReceipt = false;
} }
let lastReadEvent = this.state.events[lastReadEventIndex];
var lastReadEvent = this.state.events[lastReadEventIndex];
shouldSendReadReceipt = shouldSendReadReceipt && shouldSendReadReceipt = shouldSendReadReceipt &&
// Only send a RR if the last read Event is ahead in the timeline relative to // Only send a RR if the last read Event is ahead in the timeline relative to
// the current RR event. // the current RR event.
lastReadEventIndex > currentReadUpToEventIndex && lastReadEventIndex > currentReadUpToEventIndex &&
// Only send a RR if the last RR set != the one we would send // Only send a RR if the last RR set != the one we would send
this.last_rr_sent_event_id != lastReadEvent.getId(); this.lastRRSentSentId != lastReadEvent.getId();
// Only send a RM if the last RM sent != the one we would send // Only send a RM if the last RM sent != the one we would send
const shouldSendReadMarker = this.last_rm_sent_event_id != this.state.readMarkerEventId; const shouldSendReadMarker =
this.lastRMSentEventId != this.state.readMarkerEventId;
// we also remember the last read receipt we sent to avoid spamming the // we also remember the last read receipt we sent to avoid spamming the
// same one at the server repeatedly // same one at the server repeatedly
if (shouldSendReadReceipt || shouldSendReadMarker) { if (shouldSendReadReceipt || shouldSendReadMarker) {
if (shouldSendReadReceipt) { if (shouldSendReadReceipt) {
this.last_rr_sent_event_id = lastReadEvent.getId(); this.lastRRSentSentId = lastReadEvent.getId();
} else { } else {
lastReadEvent = null; lastReadEvent = null;
} }
this.last_rm_sent_event_id = this.state.readMarkerEventId; this.lastRMSentEventId = this.state.readMarkerEventId;
debuglog('TimelinePanel: Sending Read Markers for ', debuglog('TimelinePanel: Sending Read Markers for ',
this.props.timelineSet.room.roomId, this.props.timelineSet.room.roomId,
@ -572,12 +572,12 @@ var TimelinePanel = React.createClass({
return MatrixClientPeg.get().sendReadReceipt( return MatrixClientPeg.get().sendReadReceipt(
lastReadEvent, lastReadEvent,
).catch(() => { ).catch(() => {
this.last_rr_sent_event_id = undefined; this.lastRRSentSentId = undefined;
}); });
} }
// it failed, so allow retries next time the user is active // it failed, so allow retries next time the user is active
this.last_rr_sent_event_id = undefined; this.lastRRSentSentId = undefined;
this.last_rm_sent_event_id = undefined; this.lastRMSentEventId = undefined;
}); });
// do a quick-reset of our unreadNotificationCount to avoid having // do a quick-reset of our unreadNotificationCount to avoid having