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

Hide red highlight badge in mute mode

Browse source
This commit is contained in:
David Baker 2016-08-18 11:58:27 +01:00
parent dd088794c2
commit 73e486cc58
1 changed files with 20 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/components/views/rooms/RoomTile.js
View file

@ -49,22 +49,29 @@ module.exports = React.createClass({
badgeHover : false, badgeHover : false,
notificationTagMenu: false, notificationTagMenu: false,
roomTagMenu: false, roomTagMenu: false,
showBadge: this._shouldShowBadge(), notifState: this._getNotifState(),
}); });
}, },
_shouldShowBadge: function() { _getNotifState: function() {
if (MatrixClientPeg.get().isGuest()) return true; if (MatrixClientPeg.get().isGuest()) return 'all_messages';
return RoomNotifs.getRoomNotifsState(this.props.room.roomId);
},
_shouldShowNotifBadge: function() {
const showBadgeInStates = ['all_messages', 'all_messages_loud']; const showBadgeInStates = ['all_messages', 'all_messages_loud'];
const currentState = RoomNotifs.getRoomNotifsState(this.props.room.roomId); const currentState = this._getNotifState();
return showBadgeInStates.indexOf(currentState) > -1; return showBadgeInStates.indexOf(currentState) > -1;
}, },
_shouldShowMentionBadge: function() {
return this._getNotifState() != 'mute';
},
onAccountData: function(accountDataEvent) { onAccountData: function(accountDataEvent) {
if (accountDataEvent.getType() == 'm.push_rules') { if (accountDataEvent.getType() == 'm.push_rules') {
this.setState({ this.setState({
showBadge: this._shouldShowBadge(), notifState: this._getNotifState(),
}); });
} }
}, },
@ -177,15 +184,18 @@ module.exports = React.createClass({
var notificationCount = this.props.room.getUnreadNotificationCount(); var notificationCount = this.props.room.getUnreadNotificationCount();
// var highlightCount = this.props.room.getUnreadNotificationCount("highlight"); // var highlightCount = this.props.room.getUnreadNotificationCount("highlight");
var badges = notificationCount > 0 && this._shouldShowNotifBadge();
badges |= this.props.highlight && this._shouldShowMentionBadge();
var classes = classNames({ var classes = classNames({
'mx_RoomTile': true, 'mx_RoomTile': true,
'mx_RoomTile_selected': this.props.selected, 'mx_RoomTile_selected': this.props.selected,
'mx_RoomTile_unread': this.props.unread, 'mx_RoomTile_unread': this.props.unread,
'mx_RoomTile_unreadNotify': notificationCount > 0 && this.state.showBadge, 'mx_RoomTile_unreadNotify': notificationCount > 0 && this._shouldShowNotifBadge(),
'mx_RoomTile_highlight': this.props.highlight, 'mx_RoomTile_highlight': this.props.highlight && badges,
'mx_RoomTile_invited': (me && me.membership == 'invite'), 'mx_RoomTile_invited': (me && me.membership == 'invite'),
'mx_RoomTile_notificationTagMenu': this.state.notificationTagMenu, 'mx_RoomTile_notificationTagMenu': this.state.notificationTagMenu,
'mx_RoomTile_noBadges': !(this.props.highlight || (notificationCount > 0 && this.state.showBadge)) 'mx_RoomTile_noBadges': !badges,
}); });
var avatarClasses = classNames({ var avatarClasses = classNames({
@ -212,7 +222,7 @@ module.exports = React.createClass({
if (this.state.badgeHover || this.state.notificationTagMenu) { if (this.state.badgeHover || this.state.notificationTagMenu) {
badgeContent = "\u00B7\u00B7\u00B7"; badgeContent = "\u00B7\u00B7\u00B7";
} else if (this.props.highlight || (notificationCount > 0 && this.state.showBadge)) { } else if (badges) {
var limitedCount = (notificationCount > 99) ? '99+' : notificationCount; var limitedCount = (notificationCount > 99) ? '99+' : notificationCount;
badgeContent = notificationCount ? limitedCount : '!'; badgeContent = notificationCount ? limitedCount : '!';
} else { } else {
@ -228,7 +238,7 @@ module.exports = React.createClass({
var nameClasses = classNames({ var nameClasses = classNames({
'mx_RoomTile_name': true, 'mx_RoomTile_name': true,
'mx_RoomTile_invite': this.props.isInvite, 'mx_RoomTile_invite': this.props.isInvite,
'mx_RoomTile_badgeShown': this.props.highlight || (notificationCount > 0 && this.state.showBadge) || this.state.badgeHover || this.state.notificationTagMenu, 'mx_RoomTile_badgeShown': badges || this.state.badgeHover || this.state.notificationTagMenu,
}); });
if (this.props.selected) { if (this.props.selected) {