PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Listen for Room and use this to init the timeline, not Room.name

Browse source
This commit is contained in:
David Baker 2016-02-04 11:29:00 +00:00
parent c9a3ad31ab
commit 3c2c2b051b
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/components/structures/RoomView.js
View file

@ -122,6 +122,7 @@ module.exports = React.createClass({
componentWillMount: function() { componentWillMount: function() {
this.last_rr_sent_event_id = undefined; this.last_rr_sent_event_id = undefined;
this.dispatcherRef = dis.register(this.onAction); this.dispatcherRef = dis.register(this.onAction);
MatrixClientPeg.get().on("Room", this.onRoom);
MatrixClientPeg.get().on("Room.timeline", this.onRoomTimeline); MatrixClientPeg.get().on("Room.timeline", this.onRoomTimeline);
MatrixClientPeg.get().on("Room.name", this.onRoomName); MatrixClientPeg.get().on("Room.name", this.onRoomName);
MatrixClientPeg.get().on("Room.accountData", this.onRoomAccountData); MatrixClientPeg.get().on("Room.accountData", this.onRoomAccountData);
@ -418,12 +419,20 @@ module.exports = React.createClass({
} }
}, },
onRoom: function(room) {
if (room.roomId == this.props.roomId) {
this.setState({
room: room
});
this._initTimeline(this.props).done();
}
},
onRoomName: function(room) { onRoomName: function(room) {
if (room.roomId == this.props.roomId) { if (room.roomId == this.props.roomId) {
this.setState({ this.setState({
room: room room: room
}); });
this._initTimeline(this.props);
} }
}, },