Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3805 from tgxworld/avoid_constructing_desktop_notifications_on_mobile 

FIX: Don't subscribe to Desktop Notifications on mobile.
This commit is contained in:
Régis Hanol 2015-09-23 10:29:32 +02:00
parent 86cf86ba74 a253bf8698
commit 864607e01f
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,10 +29,6 @@ export default {
}); });
} }
bus.subscribe("/notification-alert/" + user.get('id'), function(data){
onNotification(data, user);
});
bus.subscribe("/notification/" + user.get('id'), function(data) { bus.subscribe("/notification/" + user.get('id'), function(data) {
const oldUnread = user.get('unread_notifications'); const oldUnread = user.get('unread_notifications');
const oldPM = user.get('unread_private_messages'); const oldPM = user.get('unread_private_messages');
@ -85,7 +81,13 @@ export default {
}); });
if (!Ember.testing) { if (!Ember.testing) {
initDesktopNotifications(bus); if (!Discourse.Mobile.mobileView) {
bus.subscribe("/notification-alert/" + user.get('id'), function(data){
onNotification(data, user);
});
initDesktopNotifications(bus);
}
} }
} }
} }