Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-28 09:36:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix inf scroll and timeago on users page

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2015-04-01 16:41:14 -04:00
parent 6c5c8ceeee
commit c294c3b342
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
public/src/client/users.js
View File

@@ -62,7 +62,7 @@ define('forum/users', ['translator'], function(translator) {
after: after after: after
}, function(err, data) { }, function(err, data) {
if (data && data.users.length) { if (data && data.users.length) {
onUsersLoaded(data.users); onUsersLoaded(data);
$('#load-more-users-btn').removeClass('disabled'); $('#load-more-users-btn').removeClass('disabled');
} else { } else {
$('#load-more-users-btn').addClass('disabled'); $('#load-more-users-btn').addClass('disabled');
@@ -71,13 +71,15 @@ define('forum/users', ['translator'], function(translator) {
}); });
} }
function onUsersLoaded(users) { function onUsersLoaded(data) {
users = users.filter(function(user) { data.users = data.users.filter(function(user) {
return !$('.users-box[data-uid="' + user.uid + '"]').length; return !$('.users-box[data-uid="' + user.uid + '"]').length;
}); });
templates.parse('users', 'users', {users: users}, function(html) { templates.parse('users', 'users', data, function(html) {
translator.translate(html, function(translated) { translator.translate(html, function(translated) {
translated = $(translated);
translated.find('span.timeago').timeago();
$('#users-container').append(translated); $('#users-container').append(translated);
$('#users-container .anon-user').appendTo($('#users-container')); $('#users-container .anon-user').appendTo($('#users-container'));
}); });

9
src/socket.io/user.js
View File

@@ -426,11 +426,12 @@ SocketUser.loadMore = function(socket, data, callback) {
return user.status !== 'offline'; return user.status !== 'offline';
}); });
} }
var result = {
callback(null, {
users: results.users, users: results.users,
nextStart: stop + 1 nextStart: stop + 1,
}); };
result['route_' + data.set] = true;
callback(null, result);
}); });
}; };