diff options
| author | ThibG <thib@sitedethib.com> | 2020-11-25 19:01:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-25 19:01:15 +0100 |
| commit | 29812c2e59e02ea5ff8e4818a38b59944e2367ba (patch) | |
| tree | 481dc4c0158a2def1e41f5998ef67a4e3707bb8b /app/javascript/flavours/glitch/util | |
| parent | 24696458bf22c8529b49f89b2791e3e07583b7e0 (diff) | |
| parent | b9fc807115e83347ad7bb74cd3ff82841c35809a (diff) | |
Merge pull request #1468 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/util')
| -rw-r--r-- | app/javascript/flavours/glitch/util/notifications.js | 3 | ||||
| -rw-r--r-- | app/javascript/flavours/glitch/util/stream.js | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/javascript/flavours/glitch/util/notifications.js b/app/javascript/flavours/glitch/util/notifications.js index ab119c2e3..7634cac21 100644 --- a/app/javascript/flavours/glitch/util/notifications.js +++ b/app/javascript/flavours/glitch/util/notifications.js @@ -3,6 +3,7 @@ const checkNotificationPromise = () => { try { + // eslint-disable-next-line promise/catch-or-return Notification.requestPermission().then(); } catch(e) { return false; @@ -22,7 +23,7 @@ const handlePermission = (permission, callback) => { export const requestNotificationPermission = (callback) => { if (checkNotificationPromise()) { - Notification.requestPermission().then((permission) => handlePermission(permission, callback)); + Notification.requestPermission().then((permission) => handlePermission(permission, callback)).catch(console.warn); } else { Notification.requestPermission((permission) => handlePermission(permission, callback)); } diff --git a/app/javascript/flavours/glitch/util/stream.js b/app/javascript/flavours/glitch/util/stream.js index cf1388aed..c6d12cd6f 100644 --- a/app/javascript/flavours/glitch/util/stream.js +++ b/app/javascript/flavours/glitch/util/stream.js @@ -16,7 +16,7 @@ let sharedConnection; * @property {function(): void} onDisconnect */ - /** +/** * @typedef StreamEvent * @property {string} event * @property {object} payload |