matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-08 21:42:24 +03:00
Code Activity

s/getImplicitRoomName/getDefaultRoomName/ # as kegan doesn't like the word 'implicit'

Browse Source
This commit is contained in:
Matthew Hodgson
2016-01-13 14:04:00 +00:00
parent 5f763f8ebb
commit 1b7d80a8cd
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,7 +54,7 @@ module.exports = React.createClass({
this.setState({ this.setState({
name: name ? name.getContent().name : '', name: name ? name.getContent().name : '',
implicitName: this.props.room.getImplicitRoomName(MatrixClientPeg.get().credentials.userId), defaultName: this.props.room.getDefaultRoomName(MatrixClientPeg.get().credentials.userId),
topic: topic ? topic.getContent().topic : '', topic: topic ? topic.getContent().topic : '',
}); });
} }
@@ -134,8 +134,8 @@ module.exports = React.createClass({
// 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 = "Unnamed Room"; var placeholderName = "Unnamed Room";
if (this.state.implicitName && this.state.implicitName !== '?') { if (this.state.defaultName && this.state.defaultName !== '?') {
placeholderName += " (" + this.state.implicitName + ")"; placeholderName += " (" + this.state.defaultName + ")";
} }
name = name =