* Revert "FIX: Defer removing the splash screen until the window load event fires (#17225)"

This reverts commit 6a61e855b3.

* Revert "FIX: Remove splash screen in no-js view (#17223)"

This reverts commit 5257cae1b8.
This commit is contained in:
Joe 2022-06-24 13:59:27 +08:00 committed by GitHub
parent 7d41e980c9
commit 07cb8e5300
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 22 deletions

View File

@ -82,14 +82,8 @@ const Discourse = Application.extend({
});
});
window.addEventListener(
"load",
() => {
// The app booted. Remove the splash screen
document.querySelector("#d-splash")?.remove();
},
{ once: true }
);
// The app booted. Remove the splash screen
document.querySelector("#d-splash")?.remove();
},
_registerPluginCode(version, code) {

View File

@ -3,7 +3,7 @@
<style>
html {
background: var(--secondary);
overflow-y: hidden !important;
overflow: hidden !important;
}
#d-splash {
@ -29,7 +29,6 @@
animation: fade-in 0.5s ease-in-out;
animation-delay: 2.5s;
animation-fill-mode: forwards;
color: var(--primary);
}
#d-splash .preloader-text:after {
@ -80,17 +79,5 @@
<div class="preloader-text">
<span> <%= I18n.t("js.preloader_text") %> </span>
</div>
<noscript>
<style>
html {
overflow-y: initial !important;
}
#d-splash {
display: none;
}
</style>
</noscript>
</section>
<%- end %>