Commit 6e65ecd5 authored by ι™ˆεΈ…'s avatar ι™ˆεΈ…

fix reloadSW no trigger error

parent 8bc421a7
/functions/mock/** /functions/mock/**
/scripts /scripts
/config
\ No newline at end of file
...@@ -9,18 +9,7 @@ window.addEventListener('sw.offline', () => { ...@@ -9,18 +9,7 @@ window.addEventListener('sw.offline', () => {
// Pop up a prompt on the page asking the user if they want to use the latest version // Pop up a prompt on the page asking the user if they want to use the latest version
window.addEventListener('sw.updated', e => { window.addEventListener('sw.updated', e => {
const key = `open${Date.now()}`; const reloadSW = async () => {
const btn = (
<Button type="primary" onClick={() => notification.close(key)}>
{formatMessage({ id: 'app.pwa.serviceworker.updated.ok' })}
</Button>
);
notification.open({
message: formatMessage({ id: 'app.pwa.serviceworker.updated' }),
description: formatMessage({ id: 'app.pwa.serviceworker.updated.hint' }),
btn,
key,
onClose: async () => {
// Check if there is sw whose state is waiting in ServiceWorkerRegistration // Check if there is sw whose state is waiting in ServiceWorkerRegistration
// https://developer.mozilla.org/en-US/docs/Web/API/ServiceWorkerRegistration // https://developer.mozilla.org/en-US/docs/Web/API/ServiceWorkerRegistration
const worker = e.detail && e.detail.waiting; const worker = e.detail && e.detail.waiting;
...@@ -42,6 +31,24 @@ window.addEventListener('sw.updated', e => { ...@@ -42,6 +31,24 @@ window.addEventListener('sw.updated', e => {
// Refresh current page to use the updated HTML and other assets after SW has skiped waiting // Refresh current page to use the updated HTML and other assets after SW has skiped waiting
window.location.reload(true); window.location.reload(true);
return true; return true;
}, };
const key = `open${Date.now()}`;
const btn = (
<Button
type="primary"
onClick={() => {
notification.close(key);
reloadSW();
}}
>
{formatMessage({ id: 'app.pwa.serviceworker.updated.ok' })}
</Button>
);
notification.open({
message: formatMessage({ id: 'app.pwa.serviceworker.updated' }),
description: formatMessage({ id: 'app.pwa.serviceworker.updated.hint' }),
btn,
key,
onClose: async () => {},
}); });
}); });
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment