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

fixed #3268

Browse Source
This commit is contained in:
Julian Lam
2015-07-20 14:28:33 -04:00
parent fdefff3516
commit 0c6b2b122e
2 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,7 +2,7 @@
/* globals define, socket, app */
define('forum/notifications', ['components'], function(components) {
define('forum/notifications', ['components', 'notifications'], function(components, notifs) {
var Notifications = {};
Notifications.init = function() {
@@ -25,6 +25,7 @@ define('forum/notifications', ['components'], function(components) {
}
components.get('notifications/item').removeClass('unread');
notifs.updateNotifCount(0);
});
});
};

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

@@ -47,7 +47,7 @@ define('notifications', ['sounds', 'translator'], function(sound, translator) {
if (err) {
return app.alertError(err.message);
}
increaseNotifCount(-1);
incrementNotifCount(-1);
});
});
@@ -56,7 +56,7 @@ define('notifications', ['sounds', 'translator'], function(sound, translator) {
if (err) {
app.alertError(err.message);
}
updateNotifCount(0);
Notifications.updateNotifCount(0);
});
});
@@ -73,33 +73,20 @@ define('notifications', ['sounds', 'translator'], function(sound, translator) {
}
liEl.toggleClass('unread');
increaseNotifCount(unread ? -1 : 1);
incrementNotifCount(unread ? -1 : 1);
});
});
function updateNotifCount(count) {
if (count > 0) {
notifIcon.removeClass('fa-bell-o').addClass('fa-bell');
} else {
notifIcon.removeClass('fa-bell').addClass('fa-bell-o');
}
notifIcon.toggleClass('unread-count', count > 0);
notifIcon.attr('data-content', count > 20 ? '20+' : count);
Tinycon.setBubble(count);
}
function increaseNotifCount(delta) {
function incrementNotifCount(delta) {
var count = parseInt(notifIcon.attr('data-content'), 10) + delta;
updateNotifCount(count);
Notifications.updateNotifCount(count);
}
socket.emit('notifications.getCount', function(err, count) {
if (!err) {
updateNotifCount(count);
Notifications.updateNotifCount(count);
} else {
updateNotifCount(0);
Notifications.updateNotifCount(0);
}
});
@@ -117,15 +104,30 @@ define('notifications', ['sounds', 'translator'], function(sound, translator) {
ajaxify.refresh();
}
increaseNotifCount(1);
incrementNotifCount(1);
sound.play('notification');
});
socket.on('event:notifications.updateCount', function(count) {
updateNotifCount(count);
Notifications.updateNotifCount(count);
});
};
Notifications.updateNotifCount = function(count) {
var notifIcon = $('.notification-icon');
if (count > 0) {
notifIcon.removeClass('fa-bell-o').addClass('fa-bell');
} else {
notifIcon.removeClass('fa-bell').addClass('fa-bell-o');
}
notifIcon.toggleClass('unread-count', count > 0);
notifIcon.attr('data-content', count > 20 ? '20+' : count);
Tinycon.setBubble(count);
};
return Notifications;
});