mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-07-20 16:21:18 +02:00
Code Issues Releases Wiki Activity

Sync notification count when clicking on them or marking all as read

Browse Source 
Refs #500.
This commit is contained in:
Franz Liedke
2015-09-29 01:28:14 +02:00
parent 66d4e51a18
commit 16992aa1fb
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
framework/core/js/forum/src/components/Notification.js
View File

@@ -77,6 +77,7 @@ export default class Notification extends Component {
* Mark the notification as read. * Mark the notification as read.
*/ */
markAsRead() { markAsRead() {
app.session.user.pushAttributes({unreadNotificationsCount: app.session.user.unreadNotificationsCount() - 1});
this.props.notification.save({isRead: true}); this.props.notification.save({isRead: true});
} }
} }

6
framework/core/js/forum/src/components/NotificationList.js
View File

@@ -110,7 +110,7 @@ export default class NotificationList extends Component {
* been loaded. * been loaded.
*/ */
load() { load() {
if (app.cache.notifications && !app.session.user.unreadNotificationsCount()) { if (app.cache.notifications && !app.session.user.newNotificationsCount()) {
return; return;
} }
@@ -118,7 +118,7 @@ export default class NotificationList extends Component {
m.redraw(); m.redraw();
app.store.find('notifications').then(notifications => { app.store.find('notifications').then(notifications => {
app.session.user.pushAttributes({unreadNotificationsCount: 0}); app.session.user.pushAttributes({newNotificationsCount: 0});
app.cache.notifications = notifications.sort((a, b) => b.time() - a.time()); app.cache.notifications = notifications.sort((a, b) => b.time() - a.time());
this.loading = false; this.loading = false;
@@ -132,6 +132,8 @@ export default class NotificationList extends Component {
markAllAsRead() { markAllAsRead() {
if (!app.cache.notifications) return; if (!app.cache.notifications) return;
app.session.user.pushAttributes({unreadNotificationsCount: 0});
app.cache.notifications.forEach(notification => { app.cache.notifications.forEach(notification => {
if (!notification.isRead()) { if (!notification.isRead()) {
notification.save({isRead: true}); notification.save({isRead: true});