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

closes #1180

Browse Source
This commit is contained in:
barisusakli
2014-03-09 14:02:30 -04:00
parent ec86aafb48
commit 6496b91c29
4 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
public/src/forum/footer.js
View File

@@ -8,13 +8,11 @@ define(['notifications', 'chat'], function(Notifications, Chat) {
Chat.prepareDOM();
translator.prepareDOM();
function updateUnreadCount(err, tids) {
var count = 0, unreadEl = $('#unread-count');
function updateUnreadCount(err, count) {
var unreadEl = $('#unread-count');
if (err) {
console.warn('Error updating unread count', err);
} else if(tids && tids.length) {
count = tids.length;
}
unreadEl

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

@@ -101,7 +101,7 @@ SocketTopics.markAllRead = function(socket, data, callback) {
return callback(err);
}
index.server.sockets.in('uid_' + socket.uid).emit('event:unread.updateCount', null, []);
index.server.sockets.in('uid_' + socket.uid).emit('event:unread.updateCount', null, 0);
callback();
});

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

@@ -214,7 +214,7 @@ SocketUser.getOnlineAnonCount = function(socket, data, callback) {
};
SocketUser.getUnreadCount = function(socket, data, callback) {
topics.getUnreadTids(socket.uid, 0, 19, callback);
topics.getTotalUnread(socket.uid, callback);
};
SocketUser.getActiveUsers = function(socket, data, callback) {

10
src/topics.js
View File

@@ -559,8 +559,8 @@ var async = require('async'),
};
Topics.getTotalUnread = function(uid, callback) {
Topics.getUnreadTids(uid, 0, 21, function(err, tids) {
callback(err, {count: tids ? tids.length : 0});
Topics.getUnreadTids(uid, 0, 20, function(err, tids) {
callback(err, tids ? tids.length : 0);
});
};
@@ -574,7 +574,7 @@ var async = require('async'),
}
async.whilst(function() {
return unreadTids.length < 20 && !done;
return unreadTids.length < 21 && !done;
}, function(callback) {
Topics.getLatestTids(start, stop, 'month', function(err, tids) {
if (err) {
@@ -671,8 +671,8 @@ var async = require('async'),
});
async.each(uids, function(uid, next) {
Topics.getUnreadTids(uid, 0, 19, function(err, tids) {
websockets.in('uid_' + uid).emit('event:unread.updateCount', null, tids);
Topics.getTotalUnread(uid, function(err, count) {
websockets.in('uid_' + uid).emit('event:unread.updateCount', null, count);
next();
});
}, function(err) {