From cb1fabc57860a08726f8f6f3482709232ea754e2 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 18 Dec 2015 17:53:31 +0000 Subject: [PATCH 1/5] Highlight status is now the room's unread notif count --- src/components/structures/RoomSubList.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js index 461c87fb0b..4aa9855329 100644 --- a/src/components/structures/RoomSubList.js +++ b/src/components/structures/RoomSubList.js @@ -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.unread_notification_count > 0 || self.props.label === 'Invites' } isInvite={ self.props.label === 'Invites' } incomingCall={ self.props.incomingCall && (self.props.incomingCall.roomId === room.roomId) ? self.props.incomingCall : null } /> From c96ce482bcc1136360eb955861a56fa32d231203 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 6 Jan 2016 17:36:30 +0000 Subject: [PATCH 2/5] Remove the extra icons as they break the js favicon library, and should be unnecessary because the additional sizes are muxed into the ico file. --- vector/index.html | 4 ---- 1 file changed, 4 deletions(-) diff --git a/vector/index.html b/vector/index.html index f926cea58d..777c2a9710 100644 --- a/vector/index.html +++ b/vector/index.html @@ -13,10 +13,6 @@ - - - - From eb624560072da5ef111eab382370ee9af6f1e9cd Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 20 Jan 2016 15:58:21 +0000 Subject: [PATCH 3/5] Update for new unread count format --- src/components/structures/RoomSubList.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js index 0a0660f8f8..903e8586fa 100644 --- a/src/components/structures/RoomSubList.js +++ b/src/components/structures/RoomSubList.js @@ -255,7 +255,7 @@ var RoomSubList = React.createClass({ collapsed={ self.props.collapsed || false} selected={ selected } unread={ self.props.activityMap[room.roomId] === 1 } - highlight={ room.unread_notification_count > 0 || self.props.label === 'Invites' } + highlight={ (room.unread_notifications && room.unread_notifications['notification_count'] > 0) || self.props.label === 'Invites' } isInvite={ self.props.label === 'Invites' } incomingCall={ self.props.incomingCall && (self.props.incomingCall.roomId === room.roomId) ? self.props.incomingCall : null } /> From a08d00c672b8aab402b52077e1f24b5c89596d6c Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 21 Jan 2016 10:20:45 +0000 Subject: [PATCH 4/5] Apply patch to the right branch: update for new count format --- config.json | 2 +- src/components/structures/RoomSubList.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config.json b/config.json index 923d23ab2c..9834209ae7 100644 --- a/config.json +++ b/config.json @@ -1,4 +1,4 @@ { - "default_hs_url": "https://matrix.org", + "default_hs_url": "http://localhost:8008", "default_is_url": "https://vector.im" } diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js index 903e8586fa..4ce5cff17c 100644 --- a/src/components/structures/RoomSubList.js +++ b/src/components/structures/RoomSubList.js @@ -255,7 +255,7 @@ var RoomSubList = React.createClass({ collapsed={ self.props.collapsed || false} selected={ selected } 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' } incomingCall={ self.props.incomingCall && (self.props.incomingCall.roomId === room.roomId) ? self.props.incomingCall : null } /> From 0a70fe2bd113d62ab357d56f7eda28e58d90bf64 Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 21 Jan 2016 10:30:52 +0000 Subject: [PATCH 5/5] Argh, revert accidental config commit --- config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.json b/config.json index 9834209ae7..923d23ab2c 100644 --- a/config.json +++ b/config.json @@ -1,4 +1,4 @@ { - "default_hs_url": "http://localhost:8008", + "default_hs_url": "https://matrix.org", "default_is_url": "https://vector.im" }