Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-06 22:15:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

closes #5754

Browse Source
This commit is contained in:
Baris Usakli
2017-06-13 15:20:31 -04:00
parent d1805300f7
commit 8ea5c060f5
4 changed files with 43 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
public/src/client/notifications.js
View File

@@ -1,7 +1,7 @@
'use strict';
define('forum/notifications', ['components', 'notifications'], function (components, notifs) {
define('forum/notifications', ['components'], function (components) {
var Notifications = {};
Notifications.init = function () {
@@ -12,14 +12,6 @@ define('forum/notifications', ['components', 'notifications'], function (compone
if (err) {
return app.alertError(err);
}
socket.emit('notifications.getCount', function (err, count) {
if (err) {
return app.alertError(err.message);
}
notifs.updateNotifCount(count);
});
});
});
@@ -32,7 +24,6 @@ define('forum/notifications', ['components', 'notifications'], function (compone
}
components.get('notifications/item').removeClass('unread');
notifs.updateNotifCount(0);
});
});
};

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

@@ -10,10 +10,8 @@ define('notifications', ['sounds', 'translator', 'components'], function (sounds
var notifContainer = components.get('notifications');
var notifTrigger = notifContainer.children('a');
var notifList = components.get('notifications/list');
var notifIcon = components.get('notifications/icon');
notifTrigger
.on('click', function (e) {
notifTrigger.on('click', function (e) {
e.preventDefault();
if (notifContainer.hasClass('open')) {
return;
@@ -24,15 +22,15 @@ define('notifications', ['sounds', 'translator', 'components'], function (sounds
notifList.on('click', '[data-nid]', function () {
var unread = $(this).hasClass('unread');
var nid = $(this).attr('data-nid');
if (!unread) {
return;
}
var nid = $(this).attr('data-nid');
socket.emit('notifications.markRead', nid, function (err) {
if (err) {
return app.alertError(err.message);
}
incrementNotifCount(-1);
if (unreadNotifs[nid]) {
delete unreadNotifs[nid];
}
@@ -52,7 +50,7 @@ define('notifications', ['sounds', 'translator', 'components'], function (sounds
}
liEl.toggleClass('unread');
incrementNotifCount(unread ? -1 : 1);
if (unread && unreadNotifs[nid]) {
delete unreadNotifs[nid];
}
@@ -60,11 +58,6 @@ define('notifications', ['sounds', 'translator', 'components'], function (sounds
return false;
});
function incrementNotifCount(delta) {
var count = parseInt(notifIcon.attr('data-content'), 10) + delta;
Notifications.updateNotifCount(count);
}
socket.on('event:new_notification', function (notifData) {
// If a path is defined, show notif data, otherwise show generic data
var payload = {
@@ -164,7 +157,6 @@ define('notifications', ['sounds', 'translator', 'components'], function (sounds
if (err) {
app.alertError(err.message);
}
Notifications.updateNotifCount(0);
unreadNotifs = {};
});
};

4
src/notifications.js
View File

@@ -292,7 +292,9 @@ Notifications.markUnread = function (nid, uid, callback) {
async.apply(db.sortedSetAdd, 'uid:' + uid + ':notifications:unread', notification.datetime, nid),
], next);
},
], callback);
], function (err) {
callback(err);
});
};
Notifications.markReadMultiple = function (nids, uid, callback) {

32
src/socket.io/notifications.js
View File

@@ -1,5 +1,7 @@
'use strict';
var async = require('async');
var user = require('../user');
var notifications = require('../notifications');
var SocketNotifs = module.exports;
@@ -25,13 +27,37 @@ SocketNotifs.deleteAll = function (socket, data, callback) {
};
SocketNotifs.markRead = function (socket, nid, callback) {
notifications.markRead(nid, socket.uid, callback);
async.waterfall([
function (next) {
notifications.markRead(nid, socket.uid, next);
},
function (next) {
user.notifications.pushCount(socket.uid);
next();
},
], callback);
};
SocketNotifs.markUnread = function (socket, nid, callback) {
notifications.markUnread(nid, socket.uid, callback);
async.waterfall([
function (next) {
notifications.markUnread(nid, socket.uid, next);
},
function (next) {
user.notifications.pushCount(socket.uid);
next();
},
], callback);
};
SocketNotifs.markAllRead = function (socket, data, callback) {
notifications.markAllRead(socket.uid, callback);
async.waterfall([
function (next) {
notifications.markAllRead(socket.uid, next);
},
function (next) {
user.notifications.pushCount(socket.uid);
next();
},
], callback);
};