From 85894654ae5dfa004fd29d876b49e32cab03b7c2 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Thu, 19 Jun 2014 14:30:22 +0200 Subject: Make sure last seen tooltip always appears even after searching and filtering --- settings/js/users/users.js | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'settings/js') diff --git a/settings/js/users/users.js b/settings/js/users/users.js index a911225c5c5..1c0f3eef840 100644 --- a/settings/js/users/users.js +++ b/settings/js/users/users.js @@ -80,13 +80,23 @@ var UserList = { } } $tr.find('td.storageLocation').text(storageLocation); + if(lastLogin === 0) { - lastLogin = t('settings', 'never'); + var lastLoginRel = t('settings', 'never'); + var lastLoginAbs = lastLoginRel; } else { lastLogin = new Date(lastLogin * 1000); - lastLogin = relative_modified_date(lastLogin.getTime() / 1000); + var lastLoginRel = relative_modified_date(lastLogin.getTime() / 1000); + var lastLoginAbs = formatDate(lastLogin.getTime()); } - $tr.find('td.lastLogin').text(lastLogin); + $tdLastLogin = $tr.find('td.lastLogin'); + $tdLastLogin.text(lastLoginRel); + //tooltip makes it complicated … to not insert new HTML, we adjust the + //original title. We use a temporary div to get back the html that we + //can pass later. It is also required to initialise tipsy. + var tooltip = $('
').html($($tdLastLogin.attr('original-title')).text(lastLoginAbs)).html(); + $tdLastLogin.tipsy({gravity:'s', fade:true, html:true}); + $tdLastLogin.attr('title', tooltip); $tr.appendTo($userList); if(UserList.isEmpty === true) { //when the list was emptied, one row was left, necessary to keep -- cgit v1.2.3