Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
17657aa8e2
3 changed files with 5 additions and 0 deletions
|
@ -59,6 +59,7 @@ export default class ChatCreateOrReuseDialog extends React.Component {
|
||||||
);
|
);
|
||||||
tiles.push(
|
tiles.push(
|
||||||
<RoomTile key={room.roomId} room={room}
|
<RoomTile key={room.roomId} room={room}
|
||||||
|
transparent={true}
|
||||||
collapsed={false}
|
collapsed={false}
|
||||||
selected={false}
|
selected={false}
|
||||||
unread={Unread.doesRoomHaveUnreadMessages(room)}
|
unread={Unread.doesRoomHaveUnreadMessages(room)}
|
||||||
|
|
|
@ -754,6 +754,7 @@ module.exports = withMatrixClient(React.createClass({
|
||||||
|
|
||||||
tiles.push(
|
tiles.push(
|
||||||
<RoomTile key={room.roomId} room={room}
|
<RoomTile key={room.roomId} room={room}
|
||||||
|
transparent={true}
|
||||||
collapsed={false}
|
collapsed={false}
|
||||||
selected={false}
|
selected={false}
|
||||||
unread={Unread.doesRoomHaveUnreadMessages(room)}
|
unread={Unread.doesRoomHaveUnreadMessages(room)}
|
||||||
|
|
|
@ -41,6 +41,8 @@ module.exports = React.createClass({
|
||||||
collapsed: PropTypes.bool.isRequired,
|
collapsed: PropTypes.bool.isRequired,
|
||||||
unread: PropTypes.bool.isRequired,
|
unread: PropTypes.bool.isRequired,
|
||||||
highlight: PropTypes.bool.isRequired,
|
highlight: PropTypes.bool.isRequired,
|
||||||
|
// If true, apply mx_RoomTile_transparent class
|
||||||
|
transparent: PropTypes.bool,
|
||||||
isInvite: PropTypes.bool.isRequired,
|
isInvite: PropTypes.bool.isRequired,
|
||||||
incomingCall: PropTypes.object,
|
incomingCall: PropTypes.object,
|
||||||
},
|
},
|
||||||
|
@ -188,6 +190,7 @@ module.exports = React.createClass({
|
||||||
'mx_RoomTile_invited': (me && me.membership == 'invite'),
|
'mx_RoomTile_invited': (me && me.membership == 'invite'),
|
||||||
'mx_RoomTile_menuDisplayed': this.state.menuDisplayed,
|
'mx_RoomTile_menuDisplayed': this.state.menuDisplayed,
|
||||||
'mx_RoomTile_noBadges': !badges,
|
'mx_RoomTile_noBadges': !badges,
|
||||||
|
'mx_RoomTile_transparent': this.props.transparent,
|
||||||
});
|
});
|
||||||
|
|
||||||
const avatarClasses = classNames({
|
const avatarClasses = classNames({
|
||||||
|
|
Loading…
Reference in a new issue