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

PR feedback

Browse Source
This commit is contained in:
David Baker
2016-06-28 14:59:45 +01:00
parent 98c03869a7
commit 548c392236
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -116,6 +116,9 @@ module.exports = React.createClass({
callState: null, callState: null,
guestsCanJoin: false, guestsCanJoin: false,
canPeek: false, canPeek: false,
// If we failed to load information about the room,
// store the error here.
roomLoadError: null, roomLoadError: null,
// this is true if we are fully scrolled-down, and are looking at // this is true if we are fully scrolled-down, and are looking at

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

@ -41,6 +41,9 @@ module.exports = React.createClass({
canPreview: React.PropTypes.bool, canPreview: React.PropTypes.bool,
spinner: React.PropTypes.bool, spinner: React.PropTypes.bool,
room: React.PropTypes.object, room: React.PropTypes.object,
// The alias that was used to access this room, if appropriate
roomAlias: React.PropTypes.object,
}, },
getDefaultProps: function() { getDefaultProps: function() {