summaryrefslogtreecommitdiff
path: root/packages/backend/src/server/web
diff options
context:
space:
mode:
authorかっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>2024-07-07 09:56:09 +0900
committerGitHub <noreply@github.com>2024-07-07 09:56:09 +0900
commit984d582796f41f200d417b2d7647e9cb25b8dcec (patch)
tree5cd75e86a858fb9b6311994af943afe4dab9aa12 /packages/backend/src/server/web
parentfix(backend): parse5関係の型のimport方法を変更 (#14146) (diff)
downloadsharkey-984d582796f41f200d417b2d7647e9cb25b8dcec.tar.gz
sharkey-984d582796f41f200d417b2d7647e9cb25b8dcec.tar.bz2
sharkey-984d582796f41f200d417b2d7647e9cb25b8dcec.zip
fix(frontend): サーバーサイドbootでエラー画面の描画時にDOMが初期化できていないことがあるのを修正 (#14139)
Diffstat (limited to 'packages/backend/src/server/web')
-rw-r--r--packages/backend/src/server/web/boot.js12
1 files changed, 9 insertions, 3 deletions
diff --git a/packages/backend/src/server/web/boot.js b/packages/backend/src/server/web/boot.js
index 396536948e..4275dc9527 100644
--- a/packages/backend/src/server/web/boot.js
+++ b/packages/backend/src/server/web/boot.js
@@ -29,7 +29,8 @@
let forceError = localStorage.getItem('forceError');
if (forceError != null) {
- renderError('FORCED_ERROR', 'This error is forced by having forceError in local storage.')
+ renderError('FORCED_ERROR', 'This error is forced by having forceError in local storage.');
+ return;
}
//#region Detect language & fetch translations
@@ -155,7 +156,12 @@
document.head.appendChild(css);
}
- function renderError(code, details) {
+ async function renderError(code, details) {
+ // Cannot set property 'innerHTML' of null を回避
+ if (document.readyState === 'loading') {
+ await new Promise(resolve => window.addEventListener('DOMContentLoaded', resolve));
+ }
+
let errorsElement = document.getElementById('errors');
if (!errorsElement) {
@@ -314,6 +320,6 @@
#errorInfo {
width: 50%;
}
- `)
+ }`)
}
})();