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

Merge pull request #784 from matrix-org/luke/fix-non-existant-event-dialog-finish 

Fix the onFinished for timeline pos dialog
pull/21833/head
David Baker 2017-03-30 17:31:00 +01:00 committed by GitHub
parent 11a1c8099c fff83ba234
commit 847c01b9be
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/components/structures/MatrixChat.js
View File

@ -648,16 +648,6 @@ module.exports = React.createClass({
if (room) { if (room) {
var theAlias = Rooms.getDisplayAliasForRoom(room); var theAlias = Rooms.getDisplayAliasForRoom(room);
if (theAlias) presentedId = theAlias; 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) { if (room_info.event_id) {

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

@ -819,7 +819,7 @@ var TimelinePanel = React.createClass({
// go via the dispatcher so that the URL is updated // go via the dispatcher so that the URL is updated
dis.dispatch({ dis.dispatch({
action: 'view_room', action: 'view_room',
room_id: this.props.timelineSet.roomId, room_id: this.props.timelineSet.room.roomId,
}); });
}; };
} }