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

Merge branch 'master' of https://github.com/designcreateplay/NodeBB

Browse Source
This commit is contained in:
Baris Usakli
2013-05-23 16:35:39 -04:00
parent 0f2014193d d71a38c4f7
commit 8f281e9792
5 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
public/css/style.less
View File

@@ -759,7 +759,12 @@ body .navbar .nodebb-inline-block {
#notif-list {
li {
font-size: 12px;
width: 200px;
width: 300px;
text-align: left;
a {
white-space: normal;
}
&.unread {
background: #eceff5;

4
public/templates/footer.tpl
View File

@@ -129,6 +129,10 @@
if (counts.unread > 0) notifIcon.className = 'icon-circle active';
else notifIcon.className = 'icon-circle-blank';
});
socket.on('event:new_notification', function() {
console.log('WOOT');
document.querySelector('.notifications a i').className = 'icon-circle active';
});
socket.emit('api:notifications.counts');
}());
</script>

2
public/templates/header.tpl
View File

@@ -47,7 +47,7 @@
</li>
</ul>
<ul class="nav pull-right nodebb-inline-block" id="right-menu">
<li class="notifications dropdown">
<li class="notifications dropdown text-center">
<a class="dropdown-toggle" data-toggle="dropdown" href="#" id="notif_dropdown"><i class="icon-circle-blank"></i></a>
<ul id="notif-list" class="dropdown-menu" aria-labelledby="notif_dropdown">
<li><a href="#"><i class="icon-refresh icon-spin"></i> Loading Notifications</a></li>

1
src/notifications.js
View File

@@ -55,6 +55,7 @@ var config = require('../config.js'),
(function(uid) {
Notifications.remove_by_uniqueId(notif_data.uniqueId, uid, function() {
RDB.zadd('uid:' + uid + ':notifications:unread', notif_data.score, nid);
global.io.sockets.in('uid_' + uid).emit('event:new_notification');
if (callback) callback(true);
});
})(uids[x]);

3
src/websockets.js
View File

@@ -1,5 +1,5 @@
var SocketIO = require('socket.io').listen(global.server,{log:false}),
var SocketIO = require('socket.io').listen(global.server, { log:false }),
cookie = require('cookie'),
connect = require('connect'),
config = require('../config.js'),
@@ -58,6 +58,7 @@ var SocketIO = require('socket.io').listen(global.server,{log:false}),
userSockets[uid].push(socket);
user.go_online(uid);
socket.join('uid_' + uid);
/*process.on('uncaughtException', function(err) {
// handle the error safely