AkkomaGang/masto-fe
2
2
Fork 0
Code Issues 3 Pull requests Projects Releases Wiki Activity

Default when there is no applicationServerKey meta on the page

Browse source
This commit is contained in:
Morgan Bazalgette 2018-03-31 19:12:24 +02:00 committed by Haelwenn (lanodan) Monnier
parent a915aca1db
commit 882d44afdf
No known key found for this signature in database
GPG key ID: D5B7A8E43C997DEE
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/javascript/flavours/glitch/actions/push_notifications/registerer.js
View file

@ -18,7 +18,10 @@ const urlBase64ToUint8Array = (base64String) => {
return outputArray; return outputArray;
}; };
const getApplicationServerKey = () => document.querySelector('[name="applicationServerKey"]').getAttribute('content'); const getApplicationServerKey = () => {
const k = document.querySelector('[name="applicationServerKey"]');
return k === null ? '' : k.getAttribute('content');
};
const getRegistration = () => navigator.serviceWorker.ready; const getRegistration = () => navigator.serviceWorker.ready;

5
app/javascript/mastodon/actions/push_notifications/registerer.js
View file

@ -14,7 +14,10 @@ const urlBase64ToUint8Array = (base64String) => {
return decodeBase64(base64); return decodeBase64(base64);
}; };
const getApplicationServerKey = () => document.querySelector('[name="applicationServerKey"]').getAttribute('content'); const getApplicationServerKey = () => {
const k = document.querySelector('[name="applicationServerKey"]');
return k === null ? '' : k.getAttribute('content');
};
const getRegistration = () => navigator.serviceWorker.ready; const getRegistration = () => navigator.serviceWorker.ready;