diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2017-12-08 14:57:40 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2017-12-08 14:57:40 +0900 |
| commit | a9a581adcb04e5a4e9ae8195dfaa38823fa3a366 (patch) | |
| tree | 4f896fc92f0a87a26baad1ea4347ee1eac185237 /src/web | |
| parent | Fix #952 (diff) | |
| download | sharkey-a9a581adcb04e5a4e9ae8195dfaa38823fa3a366.tar.gz sharkey-a9a581adcb04e5a4e9ae8195dfaa38823fa3a366.tar.bz2 sharkey-a9a581adcb04e5a4e9ae8195dfaa38823fa3a366.zip | |
Revert "Fix #952"
This reverts commit 8c70c9d6a0290c0d09e53e4a550d3e28c33059d2.
Diffstat (limited to 'src/web')
| -rw-r--r-- | src/web/app/boot.js | 4 | ||||
| -rw-r--r-- | src/web/app/common/scripts/check-for-update.ts | 4 | ||||
| -rw-r--r-- | src/web/assets/404.js | 4 | ||||
| -rw-r--r-- | src/web/assets/recover.html | 34 | ||||
| -rw-r--r-- | src/web/server.ts | 2 |
5 files changed, 36 insertions, 12 deletions
diff --git a/src/web/app/boot.js b/src/web/app/boot.js index 211dc2f883..0a3154ad88 100644 --- a/src/web/app/boot.js +++ b/src/web/app/boot.js @@ -95,10 +95,6 @@ // Clear cache (serive worker) try { navigator.serviceWorker.controller.postMessage('clear'); - - navigator.serviceWorker.getRegistrations().then(registrations => { - registrations.forEach(registration => registration.unregister()); - }); } catch (e) { console.error(e); } diff --git a/src/web/app/common/scripts/check-for-update.ts b/src/web/app/common/scripts/check-for-update.ts index 0b58c0a674..1540924510 100644 --- a/src/web/app/common/scripts/check-for-update.ts +++ b/src/web/app/common/scripts/check-for-update.ts @@ -11,10 +11,6 @@ export default async function(mios: MiOS) { // Clear cache (serive worker) try { navigator.serviceWorker.controller.postMessage('clear'); - - navigator.serviceWorker.getRegistrations().then(registrations => { - registrations.forEach(registration => registration.unregister()); - }); } catch (e) { console.error(e); } diff --git a/src/web/assets/404.js b/src/web/assets/404.js index 285704d113..46fd004f14 100644 --- a/src/web/assets/404.js +++ b/src/web/assets/404.js @@ -5,10 +5,6 @@ if (yn) { // Clear cache (serive worker) try { navigator.serviceWorker.controller.postMessage('clear'); - - navigator.serviceWorker.getRegistrations().then(registrations => { - registrations.forEach(registration => registration.unregister()); - }); } catch (e) { console.error(e); } diff --git a/src/web/assets/recover.html b/src/web/assets/recover.html new file mode 100644 index 0000000000..019f57b2e7 --- /dev/null +++ b/src/web/assets/recover.html @@ -0,0 +1,34 @@ +<!DOCTYPE html> + +<html> + <head> + <meta charset="utf-8"> + <title>Misskeyのリカバリ</title> + <script> + + const yn = window.confirm('キャッシュをクリアしますか？\n\nDo you want to clear caches?'); + + if (yn) { + try { + navigator.serviceWorker.controller.postMessage('clear'); + + navigator.serviceWorker.getRegistrations().then(registrations => { + registrations.forEach(registration => registration.unregister()); + }); + + } catch (e) { + console.error(e); + } + + localStorage.setItem('should-refresh', 'true'); + + alert('キャッシュをクリアしました。'); + + location.href = '/'; + } else { + alert('問題が解決しない場合はサーバー管理者までお問い合せください。'); + } + + </script> + </head> +</html> diff --git a/src/web/server.ts b/src/web/server.ts index 5b09788b2d..1d3687f89e 100644 --- a/src/web/server.ts +++ b/src/web/server.ts @@ -44,6 +44,8 @@ app.use('/assets', (req, res) => { res.sendStatus(404); }); +app.use('/recover', (req, res) => res.sendFile(`${__dirname}/assets/recover.html`)); + /** * ServiceWroker */ |