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

Code clean up, and better comments, along with z-index fixes for scrollbar and avatar menu

Browse source
This commit is contained in:
wmwragg 2016-08-30 10:45:59 +01:00
parent f2e8607433
commit ff3ad47be7
4 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -119,7 +119,6 @@ var RoomSubList = React.createClass({
// The dataset elements are added in the RoomList _initAndPositionStickyHeaders method
isCollapsableOnClick: function() {
var stuck = this.refs.header.dataset.stuck;
var topBottomSticky = this.refs.header.dataset.topBottomSticky;
if (this.state.hidden || stuck === undefined || stuck === "none") {
return true;
} else {
@ -249,11 +248,8 @@ var RoomSubList = React.createClass({
roomNotificationCount: function() {
var self = this;
var subListCount = 0;
var subListHighlight = false;
var cli = MatrixClientPeg.get();
this.props.list.map(function(room) {
return this.props.list.reduce(function(result, room) {
var roomNotifState = RoomNotifs.getRoomNotifsState(room.roomId);
var highlight = room.getUnreadNotificationCount('highlight') > 0 || self.props.label === 'Invites';
var notificationCount = room.getUnreadNotificationCount();
@ -263,14 +259,13 @@ var RoomSubList = React.createClass({
const badges = notifBadges || mentionBadges;
if (badges) {
subListCount += notificationCount;
result[0] += notificationCount;
if (highlight) {
subListHighlight = true;
result[1] = true;
}
}
});
return [subListCount, subListHighlight];
return result;
}, [0, false]);
},
_updateSubListCount: function() {