diff options
author | Thibaut Girka <thib@sitedethib.com> | 2020-11-25 15:31:45 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2020-11-25 15:31:45 +0100 |
commit | e71b16ae2b5623dc664c79ffa7d96282af662c78 (patch) | |
tree | db77dc96f03d7e9b51e33b379dd1f1b9bebc0343 /app/javascript/mastodon/actions | |
parent | 24696458bf22c8529b49f89b2791e3e07583b7e0 (diff) | |
parent | 41b38b027396d50cac2cf995f2b5830c2cf592fa (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `Gemfile.lock`: glitch-soc-only dependency textually too close to updated upstream dependencies. Updated to upsteam dependencies.
Diffstat (limited to 'app/javascript/mastodon/actions')
-rw-r--r-- | app/javascript/mastodon/actions/notifications.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/mastodon/actions/notifications.js b/app/javascript/mastodon/actions/notifications.js index d40b65745..93e18fba9 100644 --- a/app/javascript/mastodon/actions/notifications.js +++ b/app/javascript/mastodon/actions/notifications.js @@ -257,7 +257,7 @@ export function setupBrowserNotifications() { if ('Notification' in window && 'permissions' in navigator) { navigator.permissions.query({ name: 'notifications' }).then((status) => { status.onchange = () => dispatch(setBrowserPermission(Notification.permission)); - }); + }).catch(console.warn); } }; } |