Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-01 11:35:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

online users fix

Browse Source 
and jshint cleanup
This commit is contained in:
barisusakli
2014-07-29 23:49:45 -04:00
parent bb7a71389e
commit 8caedc935b
2 changed files with 111 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

176
public/src/forum/users.js
View File

@@ -1,21 +1,16 @@
'use strict';
/* globals define, socket, app, ajaxify, templates, translator*/
define('forum/users', function() {
var Users = {};
Users.init = function() {
var timeoutId = 0;
var loadingMoreUsers = false;
function getActiveSection() {
var url = window.location.href,
parts = url.split('/'),
active = parts[parts.length - 1];
return active;
}
Users.init = function() {
var active = getActiveSection();
var lastSearch = null;
$('.nav-pills li').removeClass('active');
$('.nav-pills li a').each(function() {
var $this = $(this);
@@ -25,6 +20,78 @@ define('forum/users', function() {
}
});
handleSearch();
socket.removeListener('user.anonDisconnect', updateAnonCount);
socket.removeListener('user.anonConnect', updateAnonCount);
socket.removeListener('user.isOnline', onUserIsOnline);
socket.on('user.anonDisconnect', updateAnonCount);
socket.on('user.anonConnect', updateAnonCount);
socket.on('user.isOnline', onUserIsOnline);
$('#load-more-users-btn').on('click', loadMoreUsers);
$(window).off('scroll').on('scroll', function() {
var bottom = ($(document).height() - $(window).height()) * 0.9;
if ($(window).scrollTop() > bottom && !loadingMoreUsers) {
loadMoreUsers();
}
});
};
function loadMoreUsers() {
var set = '';
var activeSection = getActiveSection();
if (activeSection === 'latest') {
set = 'users:joindate';
} else if (activeSection === 'sort-posts') {
set = 'users:postcount';
} else if (activeSection === 'sort-reputation') {
set = 'users:reputation';
} else if (activeSection === 'online' || activeSection === 'users') {
set = 'users:online';
}
if (set) {
startLoading(set, $('#users-container').children('.registered-user').length);
}
}
function startLoading(set, after) {
loadingMoreUsers = true;
socket.emit('user.loadMore', {
set: set,
after: after
}, function(err, data) {
if (data && data.users.length) {
onUsersLoaded(data.users);
$('#load-more-users-btn').removeClass('disabled');
} else {
$('#load-more-users-btn').addClass('disabled');
}
loadingMoreUsers = false;
});
}
function onUsersLoaded(users) {
ajaxify.loadTemplate('users', function(usersTemplate) {
var html = templates.parse(templates.getBlock(usersTemplate, 'users'), {users: users});
translator.translate(html, function(translated) {
$('#users-container').append(translated);
$('#users-container .anon-user').appendTo($('#users-container'));
});
});
}
function handleSearch() {
var timeoutId = 0;
var lastSearch = null;
$('#search-user').on('keyup', function() {
if (timeoutId !== 0) {
clearTimeout(timeoutId);
@@ -85,17 +152,33 @@ define('forum/users', function() {
}, 250);
});
}
socket.on('user.isOnline', function(err, data) {
function onUserIsOnline(err, data) {
var section = getActiveSection();
if((section.indexOf('online') === 0 || section.indexOf('users') === 0) && !loadingMoreUsers) {
startLoading('users:online', 0, true);
updateUser(data);
updateAnonCount();
}
});
}
socket.on('user.anonDisconnect', updateAnonCount);
socket.on('user.anonConnect', updateAnonCount)
function updateUser(data) {
var userEl = $('#users-container li[data-uid="' + data.uid +'"]');
if (!data.online) {
userEl.remove();
} else {
ajaxify.loadTemplate('users', function(usersTemplate) {
var html = templates.parse(templates.getBlock(usersTemplate, 'users'), {users: [data]});
translator.translate(html, function(translated) {
if (!userEl.length) {
$('#users-container').append(translated);
} else {
userEl.replaceWith(translated);
}
});
});
}
}
function updateAnonCount() {
var section = getActiveSection();
@@ -112,66 +195,11 @@ define('forum/users', function() {
}
}
function onUsersLoaded(users, emptyContainer) {
ajaxify.loadTemplate('users', function(usersTemplate) {
var html = templates.parse(templates.getBlock(usersTemplate, 'users'), {users: users});
translator.translate(html, function(translated) {
if(emptyContainer) {
$('#users-container .registered-user').remove();
function getActiveSection() {
var url = window.location.href,
parts = url.split('/');
return parts[parts.length - 1];
}
$('#users-container').append(translated);
$('#users-container .anon-user').appendTo($('#users-container'));
});
});
}
function loadMoreUsers() {
var set = '';
if (active === 'latest') {
set = 'users:joindate';
} else if (active === 'sort-posts') {
set = 'users:postcount';
} else if (active === 'sort-reputation') {
set = 'users:reputation';
} else if (active === 'online' || active === 'users') {
set = 'users:online';
}
if (set) {
startLoading(set, $('#users-container').children('.registered-user').length);
}
}
function startLoading(set, after, emptyContainer) {
loadingMoreUsers = true;
socket.emit('user.loadMore', {
set: set,
after: after
}, function(err, data) {
if (data && data.users.length) {
onUsersLoaded(data.users, emptyContainer);
$('#load-more-users-btn').removeClass('disabled');
} else {
$('#load-more-users-btn').addClass('disabled');
}
loadingMoreUsers = false;
});
}
$('#load-more-users-btn').on('click', loadMoreUsers);
$(window).off('scroll').on('scroll', function() {
var bottom = ($(document).height() - $(window).height()) * 0.9;
if ($(window).scrollTop() > bottom && !loadingMoreUsers) {
loadMoreUsers();
}
});
};
return Users;
});

2
src/user.js
View File

@@ -414,7 +414,7 @@ var bcrypt = require('bcryptjs'),
};
User.isOnline = function(uid, callback) {
User.getUserFields(uid, ['username', 'userslug', 'picture', 'status'] , function(err, data) {
User.getUserFields(uid, ['username', 'userslug', 'picture', 'status', 'reputation', 'postcount'] , function(err, data) {
if(err) {
return callback(err);
}