Merge remote-tracking branch 'misskey-original/develop' into develop

# Conflicts:
#	package.json
This commit is contained in:
mattyatea 2024-02-11 14:46:59 +09:00
commit 0cf3082902
28 changed files with 696 additions and 230 deletions

View file

@ -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 クライアントが更新されたかチェック
@ -289,5 +283,10 @@ function removeSplash() {
if (splash) {
splash.style.opacity = '0';
splash.style.pointerEvents = 'none';
// transitionendイベントが発火しない場合があるため
window.setTimeout(() => {
splash.remove();
}, 1000);
}
}