incorporate PR feedback

lib/models/event-timeline-set.js

@@ -53,14 +53,12 @@ if (DEBUG) {
  * map from event_id to timeline and index.
  *
  * @constructor
- * @param {?String} roomId  the roomId of this timelineSet's room, if any
  * @param {?Room} room      the optional room for this timelineSet
  * @param {Object} opts     hash of options inherited from Room.
  *      opts.timelineSupport gives whether timeline support is enabled
  *      opts.filter is the filter object, if any, for this timelineSet.
  */
-function EventTimelineSet(roomId, room, opts) {
-    this.roomId = roomId;
+function EventTimelineSet(room, opts) {
     this.room = room;
 
     this._timelineSupport = Boolean(opts.timelineSupport);
@@ -475,7 +473,6 @@ EventTimelineSet.prototype.addEventToTimeline = function(event, timeline,
     var data = {
         timeline: timeline,
         liveEvent: !toStartOfTimeline && timeline == this._liveTimeline,
-        timelineSet: this,
     };
     this.emit("Room.timeline", event, this.room,
               Boolean(toStartOfTimeline), false, data);
@@ -483,7 +480,7 @@ EventTimelineSet.prototype.addEventToTimeline = function(event, timeline,
 
 /**
  * Replaces event with ID oldEventId with one with newEventId, if oldEventId is
- * recognised.  Otherwise, add to the live timeline.
+ * recognised.  Otherwise, add to the live timeline.  Used to handle remote echos.
  *
  * @param {MatrixEvent} localEvent     the new event to be added to the timeline
  * @param {String} oldEventId          the ID of the original event
@@ -491,7 +488,7 @@ EventTimelineSet.prototype.addEventToTimeline = function(event, timeline,
  *
  * @fires module:client~MatrixClient#event:"Room.timeline"
  */
-EventTimelineSet.prototype.replaceOrAddEvent = function(localEvent, oldEventId,
+EventTimelineSet.prototype.handleRemoteEcho = function(localEvent, oldEventId,
                                                         newEventId) {
     // XXX: why don't we infer newEventId from localEvent?
     var existingTimeline = this._eventIdToTimeline[oldEventId];
@@ -529,7 +526,6 @@ EventTimelineSet.prototype.removeEvent = function(eventId) {
         delete this._eventIdToTimeline[eventId];
         var data = {
             timeline: timeline,
-            timelineSet: this,
         };
         this.emit("Room.timeline", removed, this.room, undefined, true, data);
     }