Merge pull request #3376 from vector-im/luke/refactor-room-tile

`view_room` dispatch from `onClick` RoomTile
pull/3395/head
Luke Barnard 2017-03-07 16:20:31 +00:00 committed by GitHub
commit 08852c6174
1 changed files with 10 additions and 1 deletions

View File

@ -146,6 +146,13 @@ var RoomSubList = React.createClass({
} }
}, },
onRoomTileClick(roomId) {
dis.dispatch({
action: 'view_room',
room_id: roomId,
});
},
tsOfNewestEvent: function(room) { tsOfNewestEvent: function(room) {
for (var i = room.timeline.length - 1; i >= 0; --i) { for (var i = room.timeline.length - 1; i >= 0; --i) {
var ev = room.timeline[i]; var ev = room.timeline[i];
@ -364,7 +371,9 @@ var RoomSubList = React.createClass({
highlight={ room.getUnreadNotificationCount('highlight') > 0 || self.props.label === 'Invites' } highlight={ room.getUnreadNotificationCount('highlight') > 0 || self.props.label === 'Invites' }
isInvite={ self.props.label === 'Invites' } isInvite={ self.props.label === 'Invites' }
refreshSubList={ self._updateSubListCount } refreshSubList={ self._updateSubListCount }
incomingCall={ null } /> incomingCall={ null }
onClick={ self.onRoomTileClick }
/>
); );
}); });
}, },