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

use room.getImplicitRoomName() from matthew/roomsettings2 branch of matrix-js-sdk for the placeholder roomname

pull/21833/head
Matthew Hodgson 2016-01-10 20:01:30 +00:00
parent 0cb6094992
commit 6351258b0e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/views/rooms/RoomHeader.js
View File

@ -48,7 +48,7 @@ module.exports = React.createClass({
this.setState({ this.setState({
name: name ? name.getContent().name : '', name: name ? name.getContent().name : '',
initialName: name ? name.getContent().name : '', implicitName: this.props.room.getImplicitRoomName(MatrixClientPeg.get().credentials.userId),
topic: topic ? topic.getContent().topic : '', topic: topic ? topic.getContent().topic : '',
}); });
} }
@ -121,7 +121,7 @@ module.exports = React.createClass({
// </div> // </div>
// if (topic) topic_el = <div className="mx_RoomHeader_topic"><textarea>{ topic.getContent().topic }</textarea></div> // if (topic) topic_el = <div className="mx_RoomHeader_topic"><textarea>{ topic.getContent().topic }</textarea></div>
var placeholderName = this.state.initialName ? "Unnamed Room" : this.props.room.name; var placeholderName = this.state.implicitName || "Unnamed Room";
name = name =
<div className="mx_RoomHeader_name"> <div className="mx_RoomHeader_name">