Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-07-07 15:51:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

added API call for total unread topics; moved unread notification parsing to client side

Browse Source 
also fixed a bug where the new notification icon glow would disappear on
page refresh even if there were existing notifications.
This commit is contained in:
psychobunny
2013-08-21 23:34:35 +08:00
parent 5ab1758d28
commit 746fa93c80
6 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/src/ajaxify.js
View File

@@ -79,9 +79,7 @@ var ajaxify = {};
}, url, template);
socket.emit('api:meta.buildTitle', url, function(title) {
document.title = title;
});
utils.refreshTitle(url);
return true;
}

14
public/src/utils.js
View File

@@ -126,12 +126,16 @@
return tags;
},
refreshTitle: function() {
var a = document.createElement('a');
refreshTitle: function(url) {
if (!url) {
var a = document.createElement('a');
a.href = document.location;
url = a.pathname.slice(1);
}
a.href = document.location;
socket.emit('api:meta.buildTitle', a.pathname.slice(1), function(title) {
document.title = title;
socket.emit('api:meta.buildTitle', url, function(title, numNotifications) {
document.title = (numNotifications > 0 ? '(' + numNotifications + ') ' : '') + title;
if (numNotifications > 0) document.querySelector('.notifications a i').className = 'icon-circle active';
});
}
}

4
src/meta.js
View File

@@ -81,9 +81,9 @@ var utils = require('./../public/src/utils.js'),
var title;
if (err) title = global.config.title || 'NodeBB';
else title = (values.notifCount > 0 ? '(' + values.notifCount + ') ' : '') + (values.title ? values.title + ' | ' : '') + (global.config.title || 'NodeBB');
else title = (values.title ? values.title + ' | ' : '') + (global.config.title || 'NodeBB');
callback(null, title);
callback(null, title, values.notifCount);
});
},
parseFragment: function(urlFragment, callback) {

7
src/routes/api.js
View File

@@ -137,6 +137,13 @@ var user = require('./../user.js'),
});
});
app.get('/api/unread/total', function(req, res) {
var uid = (req.user) ? req.user.uid : 0;
topics.getTotalUnread(uid, function(data) {
res.json(data);
});
});
app.get('/api/confirm/:id', function(req, res) {
user.email.confirm(req.params.id, function(data) {
if (data.status === 'ok') {

9
src/topics.js
View File

@@ -127,6 +127,15 @@ marked.setOptions({
});
}
Topics.getTotalUnread = function(uid, callback) {
RDB.zcount('topics:recent', '-inf', '+inf', function(err, count) {
if (err) count = 0;
console.log(count);
callback(count);
});
};
Topics.getUnreadTopics = function(uid, start, stop, callback) {
var unreadTopics = {

4
src/websockets.js
View File

@@ -739,8 +739,8 @@ var SocketIO = require('socket.io').listen(global.server, { log:false }),
});
socket.on('api:meta.buildTitle', function(text, callback) {
meta.title.build(text, uid, function(err, title) {
callback(title);
meta.title.build(text, uid, function(err, title, numNotifications) {
callback(title, numNotifications);
});
});
});