Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: Ensure splash screen logic is iOS12 compatible (#17401) 

The `?.` safe navigation operator is not supported, and inline scripts are not run through babel.
This commit is contained in:
David Taylor 2022-07-09 11:38:31 +01:00 committed by GitHub
parent fec3df60cb
commit 4f18f3ac20
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/views/common/_discourse_splash.html.erb
View File

@ -226,12 +226,12 @@
const encodedSvg = btoa(svgString); const encodedSvg = btoa(svgString);
const splashWrapper = document.querySelector("#d-splash"); const splashWrapper = document.querySelector("#d-splash");
const splashImage = splashWrapper?.querySelector(".preloader-image"); const splashImage = splashWrapper && splashWrapper.querySelector(".preloader-image");
if (splashImage) { if (splashImage) {
splashImage.src = `data:image/svg+xml;base64,${encodedSvg}`; splashImage.src = `data:image/svg+xml;base64,${encodedSvg}`;
const connectStart = performance?.timing?.connectStart || 0; const connectStart = performance.timing.connectStart || 0;
const splashDelay = connectStart ? DELAY_TARGET : 0; const splashDelay = connectStart ? DELAY_TARGET : 0;
const targetTime = connectStart + DELAY_TARGET; const targetTime = connectStart + DELAY_TARGET;
@ -239,8 +239,8 @@
let discourseReady; let discourseReady;
const swapSplash = () => { const swapSplash = () => {
splashWrapper?.style.setProperty("--animation-state", "running"); splashWrapper && splashWrapper.style.setProperty("--animation-state", "running");
svgElement?.style.setProperty("--animation-state", "running"); svgElement && svgElement.style.setProperty("--animation-state", "running");
const newSvgString = new XMLSerializer().serializeToString(svgElement); const newSvgString = new XMLSerializer().serializeToString(svgElement);
const newEncodedSvg = btoa(newSvgString); const newEncodedSvg = btoa(newSvgString);
@ -273,7 +273,7 @@
"discourse-ready", "discourse-ready",
() => { () => {
discourseReady = true; discourseReady = true;
splashWrapper?.remove(); splashWrapper && splashWrapper.remove();
performance.mark("discourse-splash-removed"); performance.mark("discourse-splash-removed");
}, },
{ once: true } { once: true }