From fff83ba23456e7c72b2d0c8b2ba5e3465802da6a Mon Sep 17 00:00:00 2001 From: Luke Barnard Date: Thu, 30 Mar 2017 17:18:22 +0100 Subject: [PATCH] Fix the onFinished for timeline pos dialog This was causing a blank RoomView because it was trying to work with `room_id = undefined`. --- src/components/structures/MatrixChat.js | 10 ---------- src/components/structures/TimelinePanel.js | 2 +- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js index a4cbb1ac0d..50e93a89d9 100644 --- a/src/components/structures/MatrixChat.js +++ b/src/components/structures/MatrixChat.js @@ -648,16 +648,6 @@ module.exports = React.createClass({ if (room) { var theAlias = Rooms.getDisplayAliasForRoom(room); if (theAlias) presentedId = theAlias; - - // No need to do this given RoomView triggers it itself... - // var color_scheme_event = room.getAccountData("org.matrix.room.color_scheme"); - // var color_scheme = {}; - // if (color_scheme_event) { - // color_scheme = color_scheme_event.getContent(); - // // XXX: we should validate the event - // } - // console.log("Tinter.tint from _viewRoom"); - // Tinter.tint(color_scheme.primary_color, color_scheme.secondary_color); } if (room_info.event_id) { diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js index 07e534a359..ffeb5b9a1f 100644 --- a/src/components/structures/TimelinePanel.js +++ b/src/components/structures/TimelinePanel.js @@ -819,7 +819,7 @@ var TimelinePanel = React.createClass({ // go via the dispatcher so that the URL is updated dis.dispatch({ action: 'view_room', - room_id: this.props.timelineSet.roomId, + room_id: this.props.timelineSet.room.roomId, }); }; }