mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-26 19:26:04 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #272 from matrix-org/rav/fix_roomname

Browse source 
Make sure that we update the room name
This commit is contained in:
Richard van der Hoff 2016-04-17 18:12:18 +01:00
commit 336d91dadb
1 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/components/views/rooms/RoomHeader.js
View file

@ -53,6 +53,13 @@ module.exports = React.createClass({
componentDidMount: function() {
var cli = MatrixClientPeg.get();
cli.on("RoomState.events", this._onRoomStateEvents);
// When a room name occurs, RoomState.events is fired *before*
// room.name is updated. So we have to listen to Room.name as well as
// RoomState.events.
if (this.props.room) {
this.props.room.on("Room.name", this._onRoomNameChange);
}
},
componentDidUpdate: function() {
@ -62,6 +69,9 @@ module.exports = React.createClass({
},
componentWillUnmount: function() {
if (this.props.room) {
this.props.room.removeListener("Room.name", this._onRoomNameChange);
}
var cli = MatrixClientPeg.get();
if (cli) {
cli.removeListener("RoomState.events", this._onRoomStateEvents);
@ -77,6 +87,10 @@ module.exports = React.createClass({
this.forceUpdate();
},
_onRoomNameChange: function(room) {
this.forceUpdate();
},
onAvatarPickerClick: function(ev) {
if (this.refs.file_label) {
this.refs.file_label.click();
@ -98,7 +112,7 @@ module.exports = React.createClass({
description: "Failed to set avatar. " + errMsg
});
}).done();
},
},
/**
* After editing the settings, get the new name for the room
@ -272,7 +286,7 @@ module.exports = React.createClass({
var right_row;
if (!this.props.editing) {
right_row =
right_row =
<div className="mx_RoomHeader_rightRow">
{ forget_button }
{ leave_button }