treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Try to fix for browsers that don't support notifications

remotes/1727458204337373841/tmp_refs/heads/signup-info-prompt
Eugen Rochko 2016-11-21 10:59:59 +01:00
parent c41dc5e8e9
commit e3665c1d67
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/javascripts/components/actions/notifications.jsx
View File

@ -34,10 +34,12 @@ export function updateNotifications(notification, intlMessages, intlLocale) {
fetchRelatedRelationships(dispatch, [notification]); fetchRelatedRelationships(dispatch, [notification]);
// Desktop notifications // Desktop notifications
const title = new IntlMessageFormat(intlMessages[`notification.${notification.type}`], intlLocale).format({ name: notification.account.display_name.length > 0 ? notification.account.display_name : notification.account.username }); if (typeof window.Notification !== 'undefined') {
const body = $('<p>').html(notification.status ? notification.status.content : '').text(); const title = new IntlMessageFormat(intlMessages[`notification.${notification.type}`], intlLocale).format({ name: notification.account.display_name.length > 0 ? notification.account.display_name : notification.account.username });
const body = $('<p>').html(notification.status ? notification.status.content : '').text();
new Notification(title, { body, icon: notification.account.avatar }); new Notification(title, { body, icon: notification.account.avatar });
}
}; };
}; };

2
app/assets/javascripts/components/containers/mastodon.jsx
View File

@ -88,7 +88,7 @@ const Mastodon = React.createClass({
} }
// Desktop notifications // Desktop notifications
if (Notification.permission === 'default') { if (typeof window.Notification !== 'undefined' && Notification.permission === 'default') {
Notification.requestPermission(); Notification.requestPermission();
} }
}, },