codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2025-04-29 15:35:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Correct live refresh routine for notifications

Browse source
This commit is contained in:
Sam 2016-02-18 13:20:22 +11:00
parent 52a6682690
commit f9c5cded6f
1 changed files with 23 additions and 22 deletions

45
app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6
View file

@ -49,34 +49,35 @@ export default {
const oldNotifications = stale.results.get('content'); const oldNotifications = stale.results.get('content');
const staleIndex = _.findIndex(oldNotifications, {id: lastNotification.id}); const staleIndex = _.findIndex(oldNotifications, {id: lastNotification.id});
if (staleIndex > -1) { if (staleIndex === -1) {
oldNotifications.splice(staleIndex, 1); // this gets a bit tricky, uread pms are bumped to front
var insertPosition = 0;
if (lastNotification.notification_type !== 6) {
insertPosition = _.findIndex(oldNotifications, function(n){
return n.notification_type !== 6 || n.read;
});
insertPosition = insertPosition === -1 ? oldNotifications.length - 1 : insertPosition;
}
oldNotifications.insertAt(insertPosition, Em.Object.create(lastNotification));
} }
// this gets a bit tricky, uread pms are bumped to front for (var idx=0; idx < data.recent.length; idx++) {
var insertPosition = 0; var old;
if (lastNotification.notification_type !== 6) { while(old = oldNotifications[idx]) {
insertPosition = _.findIndex(oldNotifications, function(n){ var info = data.recent[idx];
return n.notification_type !== 6 || n.read;
});
insertPosition = insertPosition === -1 ? oldNotifications.length - 1 : insertPosition;
}
oldNotifications.splice(insertPosition, 0, Em.Object.create(lastNotification));
var idx=0;
data.recent.forEach((info)=> {
var old = oldNotifications[idx];
if (old) {
if (old.get('id') !== info[0]) { if (old.get('id') !== info[0]) {
oldNotifications.splice(idx, 1); oldNotifications.removeAt(idx);
return; } else {
} else if (old.get('read') !== info[1]) { if (old.get('read') !== info[1]) {
old.set('read', info[1]); old.set('read', info[1]);
}
break;
} }
} }
idx += 1; if ( !old ) { break; }
}); }
} }
}, user.notification_channel_position); }, user.notification_channel_position);