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

Merge pull request #1107 from matrix-org/luke/fix-use-room-alias-in-preview

Browse source 
Make sure to pass the roomAlias to the preview header if we have it
This commit is contained in:
David Baker 2017-06-16 11:21:03 +01:00 committed by GitHub
commit 64b555dfe3
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/structures/RoomView.js
View file

@ -1463,7 +1463,7 @@ module.exports = React.createClass({
// We have no room object for this room, only the ID. // We have no room object for this room, only the ID.
// We've got to this room by following a link, possibly a third party invite. // We've got to this room by following a link, possibly a third party invite.
var room_alias = this.state.room_alias; const roomAlias = this.state.roomAlias;
return ( return (
<div className="mx_RoomView"> <div className="mx_RoomView">
<RoomHeader ref="header" <RoomHeader ref="header"
@ -1476,7 +1476,7 @@ module.exports = React.createClass({
onForgetClick={ this.onForgetClick } onForgetClick={ this.onForgetClick }
onRejectClick={ this.onRejectThreepidInviteButtonClicked } onRejectClick={ this.onRejectThreepidInviteButtonClicked }
canPreview={ false } error={ this.state.roomLoadError } canPreview={ false } error={ this.state.roomLoadError }
roomAlias={room_alias} roomAlias={roomAlias}
spinner={previewBarSpinner} spinner={previewBarSpinner}
inviterName={inviterName} inviterName={inviterName}
invitedEmail={invitedEmail} invitedEmail={invitedEmail}