imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/develop' into dbkr/fix_user_links

Browse source
This commit is contained in:
David Baker 2016-06-28 17:15:17 +01:00
commit ba47c5a198
2 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/structures/RoomView.js
View file

@ -116,6 +116,10 @@ module.exports = React.createClass({
callState: null, callState: null,
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,
// 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

5
src/components/views/rooms/RoomPreviewBar.js
View file

@ -41,6 +41,11 @@ 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
// If given, this will be how the room is referred to (eg.
// in error messages).
roomAlias: React.PropTypes.object,
}, },
getDefaultProps: function() { getDefaultProps: function() {