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

return time and matchcount on page switch

Browse Source
This commit is contained in:
barisusakli
2015-05-19 23:13:53 -04:00
parent addd6ecde7
commit fbdae8fe1d
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -109,11 +109,6 @@ define('forum/users', ['translator'], function(translator) {
} }
function doSearch(page) { function doSearch(page) {
function reset() {
notify.html('<i class="fa fa-search"></i>');
notify.parent().removeClass('btn-warning label-warning btn-success label-success');
}
var username = $('#search-user').val(); var username = $('#search-user').val();
var notify = $('#user-notfound-notify'); var notify = $('#user-notfound-notify');
page = page || 1; page = page || 1;
@@ -132,21 +127,28 @@ define('forum/users', ['translator'], function(translator) {
onlineOnly: $('.search .online-only').is(':checked') onlineOnly: $('.search .online-only').is(':checked')
}, function(err, data) { }, function(err, data) {
if (err) { if (err) {
reset(); resetSearchNotify();
return app.alertError(err.message); return app.alertError(err.message);
} }
if (!data) { if (!data) {
return reset(); return resetSearchNotify();
} }
renderSearchResults(data); renderSearchResults(data);
}); });
} }
function resetSearchNotify() {
var notify = $('#user-notfound-notify');
notify.html('<i class="fa fa-search"></i>');
notify.parent().removeClass('btn-warning label-warning btn-success label-success');
}
function loadPage(page) { function loadPage(page) {
socket.emit('user.loadPage', {page: page, sortBy: $('.search select').val(), onlineOnly: $('.search .online-only').is(':checked')}, function(err, data) { socket.emit('user.loadPage', {page: page, sortBy: $('.search select').val(), onlineOnly: $('.search .online-only').is(':checked')}, function(err, data) {
resetSearchNotify();
if (err) { if (err) {
return app.alertError(err.message); return app.alertError(err.message);
} }

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

@@ -438,6 +438,8 @@ SocketUser.loadPage = function(socket, data, callback) {
} }
var pageCount = Math.ceil(result.count / resultsPerPage); var pageCount = Math.ceil(result.count / resultsPerPage);
var userData = { var userData = {
matchCount: result.users.length,
timing: (process.elapsedTimeSince(startTime) / 1000).toFixed(2),
users: result.users, users: result.users,
pagination: pagination.create(data.page, pageCount) pagination: pagination.create(data.page, pageCount)
}; };
@@ -448,7 +450,7 @@ SocketUser.loadPage = function(socket, data, callback) {
if (!data || !data.page) { if (!data || !data.page) {
return callback(new Error('[[error:invalid-data]]')); return callback(new Error('[[error:invalid-data]]'));
} }
var startTime = process.hrtime();
var controllers = require('../controllers/users'); var controllers = require('../controllers/users');
var pagination = require('../pagination'); var pagination = require('../pagination');
var set = ''; var set = '';