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

Fix MatrixChat syntax fail

pull/21833/head
David Baker 2016-06-14 11:57:07 +01:00
parent 11a38fce48
commit aaefdf19c5
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/components/structures/MatrixChat.js
View File

@ -506,8 +506,8 @@ module.exports = React.createClass({
page_type: this.PageTypes.RoomView, page_type: this.PageTypes.RoomView,
thirdPartyInvite: thirdPartyInvite, thirdPartyInvite: thirdPartyInvite,
roomOobData: oob_data, roomOobData: oob_data,
newState.currentRoomAlias: roomAlias, currentRoomAlias: roomAlias,
newState.currentRoomId: roomId, currentRoomId: roomId,
}; };
// if we aren't given an explicit event id, look for one in the // if we aren't given an explicit event id, look for one in the
@ -1012,8 +1012,7 @@ module.exports = React.createClass({
page_element = ( page_element = (
<RoomView <RoomView
ref="roomView" ref="roomView"
roomId={this.state.currentRoomId} roomAddress={this.state.currentRoomAlias || this.state.currentRoomId}
roomAlias={this.state.currentRoomAlias}
eventId={this.state.initialEventId} eventId={this.state.initialEventId}
thirdPartyInvite={this.state.thirdPartyInvite} thirdPartyInvite={this.state.thirdPartyInvite}
oobData={this.state.roomOobData} oobData={this.state.roomOobData}