gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Apply patch to the right branch: update for new count format

This commit is contained in:
David Baker 2016-01-21 10:20:45 +00:00
parent eb62456007
commit a08d00c672
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.json
View File

@ -1,4 +1,4 @@
{ {
"default_hs_url": "https://matrix.org", "default_hs_url": "http://localhost:8008",
"default_is_url": "https://vector.im" "default_is_url": "https://vector.im"
} }

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

@ -255,7 +255,7 @@ var RoomSubList = React.createClass({
collapsed={ self.props.collapsed || false} collapsed={ self.props.collapsed || false}
selected={ selected } selected={ selected }
unread={ self.props.activityMap[room.roomId] === 1 } unread={ self.props.activityMap[room.roomId] === 1 }
highlight={ (room.unread_notifications && room.unread_notifications['notification_count'] > 0) || self.props.label === 'Invites' } highlight={ room.getUnreadNotificationCount('highlight') > 0 || self.props.label === 'Invites' }
isInvite={ self.props.label === 'Invites' } isInvite={ self.props.label === 'Invites' }
incomingCall={ self.props.incomingCall && (self.props.incomingCall.roomId === room.roomId) ? self.props.incomingCall : null } incomingCall={ self.props.incomingCall && (self.props.incomingCall.roomId === room.roomId) ? self.props.incomingCall : null }
/> />