Skip to content

Commit

Permalink
Merge pull request #556 from vector-im/notif_sync
Browse files Browse the repository at this point in the history
Use unread count for room highlight state
  • Loading branch information
dbkr committed Jan 21, 2016
2 parents bd75234 + 0a70fe2 commit 2d91791
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 deletions.
2 changes: 1 addition & 1 deletion src/components/structures/RoomSubList.js
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ var RoomSubList = React.createClass({
collapsed={ self.props.collapsed || false}
selected={ selected }
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' }
incomingCall={ self.props.incomingCall && (self.props.incomingCall.roomId === room.roomId) ? self.props.incomingCall : null } />
);
Expand Down
4 changes: 0 additions & 4 deletions vector/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -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="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="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="shortcut icon" href="vector-icons/favicon.ico">
<meta name="apple-mobile-web-app-title" content="Vector">
Expand Down

0 comments on commit 2d91791

Please sign in to comment.