IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: ensure 'notifications_state' is up to date after creating a notification

Browse Source
This commit is contained in:
Régis Hanol
2018-05-26 02:09:48 +02:00
parent cc0a5f4526
commit f988fa31aa
6 changed files with 61 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/components/site-header.js.es6
View File

@@ -16,7 +16,7 @@ const SiteHeaderComponent = MountWidget.extend(Docking, {
_topic: null,
@observes('currentUser.unread_notifications', 'currentUser.unread_private_messages')
_notificationsChanged() {
notificationsChanged() {
this.queueRerender();
},

14
app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6
View File

@@ -35,7 +35,6 @@ export default {
bus.subscribe(`/notification/${user.get('id')}`, data => {
const store = container.lookup('service:store');
const oldUnread = user.get('unread_notifications');
const oldPM = user.get('unread_private_messages');
@@ -66,7 +65,7 @@ export default {
oldNotifications.insertAt(insertPosition, Em.Object.create(lastNotification));
}
for (let idx=0; idx < data.recent.length; idx++) {
for (let idx = 0; idx < data.recent.length; idx++) {
let old;
while(old = oldNotifications[idx]) {
const info = data.recent[idx];
@@ -96,21 +95,16 @@ export default {
});
bus.subscribe("/client_settings", data => Ember.set(siteSettings, data.name, data.value));
bus.subscribe("/refresh_client", data => {
Discourse.set("assetVersion", data);
});
bus.subscribe("/refresh_client", data => Discourse.set("assetVersion", data));
if (!Ember.testing) {
bus.subscribe(alertChannel(user), data => onNotification(data, user));
initDesktopNotifications(bus, appEvents);
if(isPushNotificationsEnabled(user, site.mobileView)) {
if (isPushNotificationsEnabled(user, site.mobileView)) {
disableDesktopNotifications();
registerPushNotifications(Discourse.User.current(), site.mobileView, router, appEvents);
}
else {
} else {
unsubscribePushNotifications(user);
}
}