mad-star-studio/element-web
2
0
Fork 0
Code Pull requests Activity

Merge remote-tracking branch 'origin/develop' into dbkr/memberinfo_list_rooms

Browse source
This commit is contained in:
David Baker 2016-09-09 16:27:00 +01:00
commit ab9786cc02
16 changed files with 525 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/components/structures/RoomSubList.js
View file

@ -418,8 +418,18 @@ var RoomSubList = React.createClass({
badge = <div className={badgeClasses}>{subListNotifCount > 99 ? "99+" : subListNotifCount}</div>;
}
// When collapsed, allow a long hover on the header to show user
// the full tag name and room count
var title;
if (this.props.collapsed) {
title = this.props.label;
if (roomCount !== '') {
title += " [" + roomCount + "]";
}
}
return (
<div className="mx_RoomSubList_labelContainer" ref="header">
<div className="mx_RoomSubList_labelContainer" title={ title } ref="header">
<div onClick={ this.onClick } className="mx_RoomSubList_label">
{ this.props.collapsed ? '' : this.props.label }
<div className="mx_RoomSubList_roomCount">{roomCount}</div>