diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js index 7c6b16229c..da5b120f7a 100644 --- a/src/components/structures/RoomSubList.js +++ b/src/components/structures/RoomSubList.js @@ -78,6 +78,9 @@ var RoomSubList = React.createClass({ // undefined if no room is selected (eg we are showing settings) selectedRoom: React.PropTypes.string, + // passed through to RoomTile and used to highlight room with `!` regardless of notifications count + isInvite: React.PropTypes.bool, + startAsHidden: React.PropTypes.bool, showSpinner: React.PropTypes.bool, // true to show a spinner if 0 elements when expanded collapsed: React.PropTypes.bool.isRequired, // is LeftPanel collapsed? @@ -246,7 +249,7 @@ var RoomSubList = React.createClass({ return this.props.list.reduce(function(result, room, index) { if (truncateAt === undefined || index >= truncateAt) { var roomNotifState = RoomNotifs.getRoomNotifsState(room.roomId); - var highlight = room.getUnreadNotificationCount('highlight') > 0 || self.props.label === 'Invites'; + var highlight = room.getUnreadNotificationCount('highlight') > 0 || self.props.isInvite; var notificationCount = room.getUnreadNotificationCount(); const notifBadges = notificationCount > 0 && self._shouldShowNotifBadge(roomNotifState); @@ -376,8 +379,8 @@ var RoomSubList = React.createClass({ collapsed={ self.props.collapsed || false} selected={ selected } unread={ Unread.doesRoomHaveUnreadMessages(room) } - highlight={ room.getUnreadNotificationCount('highlight') > 0 || self.props.label === 'Invites' } - isInvite={ self.props.label === 'Invites' } + highlight={ room.getUnreadNotificationCount('highlight') > 0 || self.props.isInvite } + isInvite={ self.props.isInvite } refreshSubList={ self._updateSubListCount } incomingCall={ null } onClick={ self.onRoomTileClick } @@ -409,6 +412,9 @@ var RoomSubList = React.createClass({ var badge; if (subListNotifCount > 0) { badge =
{ FormattingUtils.formatCount(subListNotifCount) }
; + } else if (this.props.isInvite) { + // no notifications but highlight anyway because this is an invite badge + badge =
!
; } // When collapsed, allow a long hover on the header to show user