v1.18.x
Baris Soner Usakli 11 years ago
parent 82e14eef35
commit afc0e25b26

@ -80,12 +80,13 @@ define(function() {
$('#category-no-topics').remove(); $('#category-no-topics').remove();
container.append(html); container.append(html);
$('span.timeago').timeago();
} }
function loadMoreTopics() { function loadMoreTopics() {
loadingMoreTopics = true; loadingMoreTopics = true;
socket.emit('api:topics.loadMoreUnreadTopics', { socket.emit('api:topics.loadMoreUnreadTopics', {
after: parseInt($('#topics-container').attr('data-next-start'), 10) after: parseInt($('#topics-container').attr('data-next-start'), 10);
}, function(data) { }, function(data) {
if (data.topics && data.topics.length) { if (data.topics && data.topics.length) {
onTopicsLoaded(data.topics); onTopicsLoaded(data.topics);

@ -214,10 +214,12 @@ var RDB = require('./redis.js'),
var unreadTids = [], var unreadTids = [],
done = false; done = false;
async.whilst( function continueCondition() {
function() {
return unreadTids.length < 20 && !done; return unreadTids.length < 20 && !done;
}, }
async.whilst(
continueCondition,
function(callback) { function(callback) {
RDB.zrevrange('topics:recent', start, stop, function(err, tids) { RDB.zrevrange('topics:recent', start, stop, function(err, tids) {
if (err) if (err)
@ -235,12 +237,16 @@ var RDB = require('./redis.js'),
Topics.hasReadTopics(tids, uid, function(read) { Topics.hasReadTopics(tids, uid, function(read) {
var newtids = tids.filter(function(tid, index, self) { var newtids = tids.filter(function(tid, index, self) {
return read[index] === 0; return parseInt(read[index], 10) === 0;
}); });
unreadTids.push.apply(unreadTids, newtids); unreadTids.push.apply(unreadTids, newtids);
if(continueCondition()) {
start = stop + 1; start = stop + 1;
stop = start + 19; stop = start + 19;
}
callback(null); callback(null);
}); });
} }

Loading…
Cancel
Save