imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix display of null last_active_ago timestamps

Browse source
This commit is contained in:
Matthew Hodgson 2016-03-16 22:25:57 +00:00
parent 87e1bc2f07
commit 2265d1a82a
2 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/components/views/rooms/MemberTile.js
View file

@ -84,9 +84,8 @@ module.exports = React.createClass({
this.user_last_modified_time = member.user.getLastModifiedTime(); this.user_last_modified_time = member.user.getLastModifiedTime();
// FIXME: make presence data update whenever User.presence changes... // FIXME: make presence data update whenever User.presence changes...
active = ( active = member.user.lastActiveAgo ?
(Date.now() - (member.user.lastPresenceTs - member.user.lastActiveAgo)) || -1 (Date.now() - (member.user.lastPresenceTs - member.user.lastActiveAgo)) : -1;
);
} }
this.member_last_modified_time = member.getLastModifiedTime(); this.member_last_modified_time = member.getLastModifiedTime();

5
src/components/views/rooms/UserTile.js
View file

@ -38,9 +38,8 @@ module.exports = React.createClass({
var active = -1; var active = -1;
// FIXME: make presence data update whenever User.presence changes... // FIXME: make presence data update whenever User.presence changes...
active = ( active = member.user.lastActiveAgo ?
(Date.now() - (user.lastPresenceTs - user.lastActiveAgo)) || -1 (Date.now() - (member.user.lastPresenceTs - member.user.lastActiveAgo)) : -1;
);
var BaseAvatar = sdk.getComponent('avatars.BaseAvatar'); var BaseAvatar = sdk.getComponent('avatars.BaseAvatar');
var avatarJsx = ( var avatarJsx = (