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

Merge pull request #357 from matrix-org/wmwragg/mention-state-indicator-round-2 

Wmwragg/mention state indicator round 2
pull/21833/head
Matthew Hodgson 2016-07-20 18:01:59 +01:00 committed by GitHub
parent fb964be072 ffa43ebb96
commit 9babf3f92f
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/components/views/rooms/RoomTile.js
View File

@ -95,14 +95,24 @@ module.exports = React.createClass({
name = name.replace(":", ":\u200b"); // add a zero-width space to allow linewrapping after the colon name = name.replace(":", ":\u200b"); // add a zero-width space to allow linewrapping after the colon
var badge; var badge;
var badgeContent; var badgeContent;
if (this.props.highlight || notificationCount > 0) { var badgeClasses;
if (this.state.badgeHover) {
badgeContent = "\u00B7 \u00B7 \u00B7"; if (this.state.badgeHover) {
} else { badgeContent = "\u00B7\u00B7\u00B7";
badgeContent = notificationCount ? notificationCount : '!'; } else if (this.props.highlight || notificationCount > 0) {
} badgeContent = notificationCount ? notificationCount : '!';
badge = <div className="mx_RoomTile_badge" onMouseEnter={this.badgeOnMouseEnter} onMouseLeave={this.badgeOnMouseLeave}>{ badgeContent }</div>; } else {
badgeContent = '\u200B';
} }
if (this.props.highlight || notificationCount > 0) {
badgeClasses = "mx_RoomTile_badge";
} else {
badgeClasses = "mx_RoomTile_badge mx_RoomTile_badge_no_unread";
}
badge = <div className={ badgeClasses } onMouseEnter={this.badgeOnMouseEnter} onMouseLeave={this.badgeOnMouseLeave}>{ badgeContent }</div>;
/* /*
if (this.props.highlight) { if (this.props.highlight) {
badge = <div className="mx_RoomTile_badge">!</div>; badge = <div className="mx_RoomTile_badge">!</div>;