Matrix-Mirrors/schildi-web
1
0
Fork 0
mirror of https://github.com/SchildiChat/element-web.git synced 2024-10-01 01:26:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #556 from vector-im/notif_sync

Browse Source 
Use unread count for room highlight state
This commit is contained in:
David Baker 2016-01-21 10:31:46 +00:00
commit 2d917910da
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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={ self.props.activityMap[room.roomId] === 2 } 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 } />
); );

4
vector/index.html
View File

@ -13,10 +13,6 @@
<link rel="apple-touch-icon" sizes="144x144" href="vector-icons/apple-touch-icon-144x144.png"> <link rel="apple-touch-icon" sizes="144x144" href="vector-icons/apple-touch-icon-144x144.png">
<link rel="apple-touch-icon" sizes="152x152" href="vector-icons/apple-touch-icon-152x152.png"> <link rel="apple-touch-icon" sizes="152x152" href="vector-icons/apple-touch-icon-152x152.png">
<link rel="apple-touch-icon" sizes="180x180" href="vector-icons/apple-touch-icon-180x180.png"> <link rel="apple-touch-icon" sizes="180x180" href="vector-icons/apple-touch-icon-180x180.png">
<link rel="icon" type="image/png" href="vector-icons/favicon-32x32.png" sizes="32x32">
<link rel="icon" type="image/png" href="vector-icons/android-chrome-192x192.png" sizes="192x192">
<link rel="icon" type="image/png" href="vector-icons/favicon-96x96.png" sizes="96x96">
<link rel="icon" type="image/png" href="vector-icons/favicon-16x16.png" sizes="16x16">
<link rel="manifest" href="vector-icons/manifest.json"> <link rel="manifest" href="vector-icons/manifest.json">
<link rel="shortcut icon" href="vector-icons/favicon.ico"> <link rel="shortcut icon" href="vector-icons/favicon.ico">
<meta name="apple-mobile-web-app-title" content="Vector"> <meta name="apple-mobile-web-app-title" content="Vector">