Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-31 11:05:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Julian Lam
2014-01-21 14:01:38 -05:00
parent 0020f278a5 56c789ed61
commit 397861c3cc
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/src/modules/notifications.js
View File

@@ -21,7 +21,7 @@ define(function() {
if (!err && (data.read.length + data.unread.length) > 0) { if (!err && (data.read.length + data.unread.length) > 0) {
for (x = 0; x < numUnread; x++) { for (x = 0; x < numUnread; x++) {
notifEl.setAttribute('data-nid', data.unread[x].nid); notifEl.setAttribute('data-nid', data.unread[x].nid);
notifEl.className = 'unread'; notifEl.className = data.unread[x].readClass;
notifEl.innerHTML = '<a href="' + data.unread[x].path + '"><span class="pull-right">' + utils.relativeTime(data.unread[x].datetime, true) + '</span>' + data.unread[x].text + '</a>'; notifEl.innerHTML = '<a href="' + data.unread[x].path + '"><span class="pull-right">' + utils.relativeTime(data.unread[x].datetime, true) + '</span>' + data.unread[x].text + '</a>';
notifFrag.appendChild(notifEl.cloneNode(true)); notifFrag.appendChild(notifEl.cloneNode(true));
} }

1
src/user.js
View File

@@ -932,6 +932,7 @@ var bcrypt = require('bcrypt'),
notifications.get(nid, uid, function(notif_data) { notifications.get(nid, uid, function(notif_data) {
// If the notification could not be found, silently drop it // If the notification could not be found, silently drop it
if (notif_data) { if (notif_data) {
notif_data.readClass = !notif_data.read ? 'label-warning' : '';
unread.push(notif_data); unread.push(notif_data);
} else { } else {
db.sortedSetRemove('uid:' + uid + ':notifications:unread', nid); db.sortedSetRemove('uid:' + uid + ':notifications:unread', nid);