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

Refactor of the badge logic, and also added no badges when zero notifications

pull/2028/head
wmwragg 2016-08-23 11:35:03 +01:00
parent d3fa680373
commit ee73bc3aa4
1 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/components/structures/RoomSubList.js
View File

@ -215,6 +215,15 @@ var RoomSubList = React.createClass({
this.setState({ sortedList: list.sort(comparator) }); this.setState({ sortedList: list.sort(comparator) });
}, },
_shouldShowNotifBadge: function(roomNotifState) {
const showBadgeInStates = [RoomNotifs.ALL_MESSAGES, RoomNotifs.ALL_MESSAGES_LOUD];
return showBadgeInStates.indexOf(roomNotifState) > -1;
},
_shouldShowMentionBadge: function(roomNotifState) {
return roomNotifState != RoomNotifs.MUTE;
},
roomNotificationCount: function() { roomNotificationCount: function() {
var self = this; var self = this;
var subListCount = 0; var subListCount = 0;
@ -226,17 +235,16 @@ var RoomSubList = React.createClass({
var highlight = room.getUnreadNotificationCount('highlight') > 0 || self.props.label === 'Invites'; var highlight = room.getUnreadNotificationCount('highlight') > 0 || self.props.label === 'Invites';
var notificationCount = room.getUnreadNotificationCount(); var notificationCount = room.getUnreadNotificationCount();
if (notificationCount > 0 && roomNotifState !== RoomNotifs.MUTE) { const notifBadges = notificationCount > 0 && self._shouldShowNotifBadge(roomNotifState);
if (roomNotifState === RoomNotifs.ALL_MESSAGES_LOUD const mentionBadges = highlight && self._shouldShowMentionBadge(roomNotifState);
|| roomNotifState === RoomNotifs.ALL_MESSAGES const badges = notifBadges || mentionBadges;
|| (roomNotifState === RoomNotifs.MENTIONS_ONLY && highlight))
{ if (badges) {
subListCount += notificationCount; subListCount += notificationCount;
if (highlight) { if (highlight) {
subListHighlight = true; subListHighlight = true;
} }
} }
}
}); });
return [subListCount, subListHighlight]; return [subListCount, subListHighlight];
@ -379,12 +387,17 @@ var RoomSubList = React.createClass({
'mx_RoomSubList_badgeHighlight': subListNotificationsHighlight, 'mx_RoomSubList_badgeHighlight': subListNotificationsHighlight,
}); });
var badge;
if (subListNotificationsCount > 0) {
badge = <div className={badgeClasses}>{subListNotificationsCount}</div>;
}
return ( return (
<div onClick={ this.onClick } className="mx_RoomSubList_label"> <div onClick={ this.onClick } className="mx_RoomSubList_label">
{ this.props.collapsed ? '' : this.props.label } { this.props.collapsed ? '' : this.props.label }
<div className="mx_RoomSubList_roomCount">{roomCount}</div> <div className="mx_RoomSubList_roomCount">{roomCount}</div>
<div className={chevronClasses}></div> <div className={chevronClasses}></div>
<div className={badgeClasses}>{subListNotificationsCount}</div> {badge}
</div> </div>
); );
}, },