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

More PR feedback

pull/21833/head
David Baker 2016-06-28 17:11:47 +01:00
parent 548c392236
commit e8337b2119
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/components/structures/RoomView.js
View File

@ -117,6 +117,7 @@ module.exports = React.createClass({
guestsCanJoin: false, guestsCanJoin: false,
canPeek: false, canPeek: false,
// error object, as from the matrix client/server API
// If we failed to load information about the room, // If we failed to load information about the room,
// store the error here. // store the error here.
roomLoadError: null, roomLoadError: null,

2
src/components/views/rooms/RoomPreviewBar.js
View File

@ -43,6 +43,8 @@ module.exports = React.createClass({
room: React.PropTypes.object, room: React.PropTypes.object,
// The alias that was used to access this room, if appropriate // The alias that was used to access this room, if appropriate
// If given, this will be how the room is referred to (eg.
// in error messages).
roomAlias: React.PropTypes.object, roomAlias: React.PropTypes.object,
}, },