From 1b7d80a8cd2feaf6a3c9423d1c3d39742920597d Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Wed, 13 Jan 2016 14:04:00 +0000 Subject: [PATCH] s/getImplicitRoomName/getDefaultRoomName/ # as kegan doesn't like the word 'implicit' --- src/components/views/rooms/RoomHeader.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/views/rooms/RoomHeader.js b/src/components/views/rooms/RoomHeader.js index be227bfe9d..0e69e24ede 100644 --- a/src/components/views/rooms/RoomHeader.js +++ b/src/components/views/rooms/RoomHeader.js @@ -54,7 +54,7 @@ module.exports = React.createClass({ this.setState({ 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 : '', }); } @@ -134,8 +134,8 @@ module.exports = React.createClass({ // if (topic) topic_el =
var placeholderName = "Unnamed Room"; - if (this.state.implicitName && this.state.implicitName !== '?') { - placeholderName += " (" + this.state.implicitName + ")"; + if (this.state.defaultName && this.state.defaultName !== '?') { + placeholderName += " (" + this.state.defaultName + ")"; } name =