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

Notification paths are now sent back in socket call, so client-

Browse Source 
side alert now shows more data and is clickable.
This commit is contained in:
Julian Lam
2016-01-25 10:24:05 -05:00
parent ff86369fca
commit 5de0e74908
2 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -65,13 +65,30 @@ define('notifications', ['sounds', 'translator', 'components'], function(sound,
}
socket.on('event:new_notification', function(notifData) {
app.alert({
// If a path is defined, show notif data, otherwise show generic data
var payload;
if (notifData.path) {
payload = {
alert_id: 'new_notif',
title: '[[notifications:new_notification]]',
message: notifData.bodyShort,
type: 'info',
timeout: 2000,
clickfn: function() {
ajaxify.go(notifData.path);
}
};
} else {
payload = {
alert_id: 'new_notif',
title: '[[notifications:new_notification]]',
message: '[[notifications:you_have_unread_notifications]]',
type: 'warning',
timeout: 2000
});
};
}
app.alert(payload);
app.refreshTitle();
if (ajaxify.currentPage === 'notifications') {

9
src/notifications.js
View File

@@ -195,9 +195,12 @@ var async = require('async'),
var websockets = require('./socket.io');
if (websockets.server) {
for(var i=0; i<uids.length; ++i) {
websockets.in('uid_' + uids[i]).emit('event:new_notification', notification);
}
// Add notification paths to sent notification object as well
async.eachLimit(uids, 50, function(uid, next) {
User.notifications.generateNotificationPaths([notification], uid, function(err, notifications) {
websockets.in('uid_' + uid).emit('event:new_notification', notifications[0]);
});
});
}
callback();