github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-06 03:06:53 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

BUGFIX: notifications cleared incorrectly

Browse Source 
The notifications panel would reset itself
if you got a notification while it was open

New behavior, we refresh the panel live, blue notification
is cleared automatically if its open.

If window is not visible it will close the notifications panel,
that way you don't miss notifications by accident.
This commit is contained in:
Sam Saffron
2014-06-10 11:44:49 +10:00
parent 8d04e54198
commit 2042ed02ec
1 changed files with 33 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
app/assets/javascripts/discourse/controllers/header.js.es6
View File

@ -17,9 +17,40 @@ export default Discourse.Controller.extend({
}.property('topic.isPrivateMessage'),
resetCachedNotifications: function(){
this.set("notifications", null);
// a bit hacky, but if we have no focus, hide notifications first
var visible = $("#notifications-dropdown").is(":visible");
if(!Discourse.get("hasFocus")) {
if(visible){
$("html").click();
}
this.set("notifications", null);
return;
}
if(visible){
this.refreshNotifications();
} else {
this.set("notifications", null);
}
}.observes("currentUser.lastNotificationChange"),
refreshNotifications: function(){
var self = this;
if(self.get("loading_notifications")){return;}
self.set("loading_notifications", true);
Discourse.ajax("/notifications").then(function(result) {
self.set('currentUser.unread_notifications', 0);
self.setProperties({
notifications: result,
loading_notifications: false
});
}, function(){
self.set("loading_notifications", false);
});
},
actions: {
toggleStar: function() {
var topic = this.get('topic');
@ -31,15 +62,7 @@ export default Discourse.Controller.extend({
var self = this;
if (self.get('currentUser.unread_notifications') || self.get('currentUser.unread_private_messages') || !self.get('notifications')) {
self.set("loading_notifications", true);
Discourse.ajax("/notifications").then(function(result) {
self.set('currentUser.unread_notifications', 0);
self.setProperties({
notifications: result,
loading_notifications: false
});
});
self.refreshNotifications();
}
headerView.showDropdownBySelector("#user-notifications");
},