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

use loadMoreFromSet

Browse Source
This commit is contained in:
barisusakli
2014-11-16 18:31:57 -05:00
parent 32e08ba419
commit 0a1fa72bd8
4 changed files with 4 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
public/src/client/recent.js
View File

@@ -75,8 +75,9 @@ define('forum/recent', ['forum/infinitescroll'], function(infinitescroll) {
return; return;
} }
infinitescroll.loadMore('topics.loadMoreRecentTopics', { infinitescroll.loadMore('topics.loadMoreFromSet', {
after: $('#topics-container').attr('data-nextstart') after: $('#topics-container').attr('data-nextstart'),
set: 'topics:recent'
}, function(data, done) { }, function(data, done) {
if (data.topics && data.topics.length) { if (data.topics && data.topics.length) {
Recent.onTopicsLoaded('recent', data.topics, false, done); Recent.onTopicsLoaded('recent', data.topics, false, done);

2
src/controllers/categories.js
View File

@@ -16,7 +16,7 @@ var categoriesController = {},
categoriesController.recent = function(req, res, next) { categoriesController.recent = function(req, res, next) {
var uid = req.user ? req.user.uid : 0; var uid = req.user ? req.user.uid : 0;
var end = (parseInt(meta.config.topicsPerList, 10) || 20) - 1; var end = (parseInt(meta.config.topicsPerList, 10) || 20) - 1;
topics.getRecentTopics(uid, 0, end, function (err, data) { topics.getTopicsFromSet('topics:recent', uid, 0, end, function(err, data) {
if (err) { if (err) {
return next(err); return next(err);
} }

11
src/socket.io/topics.js
View File

@@ -455,17 +455,6 @@ SocketTopics.loadMore = function(socket, data, callback) {
}); });
}; };
SocketTopics.loadMoreRecentTopics = function(socket, data, callback) {
if(!data || !data.after) {
return callback(new Error('[[error:invalid-data]]'));
}
var start = parseInt(data.after, 10),
end = start + 9;
topics.getRecentTopics(socket.uid, start, end, callback);
};
SocketTopics.loadMoreUnreadTopics = function(socket, data, callback) { SocketTopics.loadMoreUnreadTopics = function(socket, data, callback) {
if(!data || !data.after) { if(!data || !data.after) {
return callback(new Error('[[error:invalid-data]]')); return callback(new Error('[[error:invalid-data]]'));

4
src/topics/recent.js
View File

@@ -15,10 +15,6 @@ module.exports = function(Topics) {
year: 31104000000 year: 31104000000
}; };
Topics.getRecentTopics = function(uid, start, end, callback) {
Topics.getTopicsFromSet('topics:recent', uid, start, end, callback);
};
Topics.getLatestTopics = function(uid, start, end, term, callback) { Topics.getLatestTopics = function(uid, start, end, term, callback) {
async.waterfall([ async.waterfall([
function (next) { function (next) {