summaryrefslogtreecommitdiff
path: root/packages/frontend/src/boot
diff options
context:
space:
mode:
authorMarie <marie@kaifa.ch>2024-02-09 19:22:06 +0100
committerMarie <marie@kaifa.ch>2024-02-09 19:22:06 +0100
commit85355813ad07724a2fad4abdbf694d696482d439 (patch)
tree79bbf9a76c17f4022754cb09a6db5b22b673d31a /packages/frontend/src/boot
parentmerge: more upstream changes (diff)
parentfix misskey-js version (diff)
downloadsharkey-85355813ad07724a2fad4abdbf694d696482d439.tar.gz
sharkey-85355813ad07724a2fad4abdbf694d696482d439.tar.bz2
sharkey-85355813ad07724a2fad4abdbf694d696482d439.zip
merge: latest changes
Diffstat (limited to 'packages/frontend/src/boot')
-rw-r--r--packages/frontend/src/boot/common.ts11
1 files changed, 5 insertions, 6 deletions
diff --git a/packages/frontend/src/boot/common.ts b/packages/frontend/src/boot/common.ts
index f6a3e40305..65bd7cf0f1 100644
--- a/packages/frontend/src/boot/common.ts
+++ b/packages/frontend/src/boot/common.ts
@@ -60,12 +60,6 @@ export async function common(createVue: () => App<Element>) {
});
}
- const splash = document.getElementById('splash');
- // 念のためnullチェック(HTMLが古い場合があるため(そのうち消す))
- if (splash) splash.addEventListener('transitionend', () => {
- splash.remove();
- });
-
let isClientUpdated = false;
//#region クライアントが更新されたかチェック
@@ -293,5 +287,10 @@ function removeSplash() {
if (splash) {
splash.style.opacity = '0';
splash.style.pointerEvents = 'none';
+
+ // transitionendイベントが発火しない場合があるため
+ window.setTimeout(() => {
+ splash.remove();
+ }, 1000);
}
}