Cleaner boot data

This commit is contained in:
the-djmaze 2022-02-28 15:10:04 +01:00
parent 3f801cb762
commit 62b6a1513c
4 changed files with 10 additions and 42 deletions

View file

@ -27,34 +27,7 @@ body {
width: 100%; width: 100%;
} }
.e-spinner { #rl-loading .icon-spinner {
margin: 5px auto 0; height: 1em;
width: 100px; width: 1em;
text-align: center;
}
.e-spinner div {
animation: bouncedelay 1.4s infinite ease-in-out;
background-color: var(--loading-color, #000);
border-radius: 100%;
box-shadow: 0 0 3px rgba(0, 0, 0, 0.3);
display: inline-block;
height: 15px;
margin: 0 5px;
width: 15px;
/* Prevent first frame from flickering when animation starts */
animation-fill-mode: both;
}
.e-spinner div + div {
animation-delay: 0.16s;
}
.e-spinner div + div + div {
animation-delay: 0.32s;
}
@keyframes bouncedelay {
0%, 80%, 100% { transform: scale(0.0); }
40% { transform: scale(1.0); }
} }

View file

@ -186,7 +186,5 @@
} }
html.rl-started-trigger .LoginView { html.rl-started-trigger .LoginView {
/*transform: scale(1.1);*/
transform: translateY(-20px);
opacity: 0.5; opacity: 0.5;
} }

View file

@ -9,6 +9,8 @@ const
css = eId('css'), css = eId('css'),
admin = app && '1' == app.dataset.admin, admin = app && '1' == app.dataset.admin,
cb = () => rl.app.bootstart(),
showError = msg => { showError = msg => {
let div = eId('loading-error'); let div = eId('loading-error');
div.append(' ' + msg); div.append(' ' + msg);
@ -30,14 +32,14 @@ const
}); });
}; };
if (!navigator || !navigator.cookieEnabled) { if (!navigator.cookieEnabled) {
doc.location.href = './?/NoCookie'; doc.location.href = './?/NoCookie';
} }
let layout = doc.cookie.match(/(^|;) ?rllayout=([^;]+)/) || ''; let RL_APP_DATA = {},
doc.documentElement.classList.toggle('rl-mobile', 'mobile' === layout[2] || (!layout && 1000 > innerWidth)); layout = doc.cookie.match(/(^|;) ?rllayout=([^;]+)/) || '';
let RL_APP_DATA = {}; doc.documentElement.classList.toggle('rl-mobile', 'mobile' === layout[2] || (!layout && 1000 > innerWidth));
win.rl = { win.rl = {
adminArea: () => admin, adminArea: () => admin,
@ -51,7 +53,6 @@ win.rl = {
doc.title = RL_APP_DATA.Title ? (title ? title + ' - ' : '') + RL_APP_DATA.Title : (title ? '' + title : ''), doc.title = RL_APP_DATA.Title ? (title ? title + ' - ' : '') + RL_APP_DATA.Title : (title ? '' + title : ''),
initData: appData => { initData: appData => {
const cb = () => rl.app.bootstart();
RL_APP_DATA = appData; RL_APP_DATA = appData;
loadScript(appData.StaticLibJsLink) loadScript(appData.StaticLibJsLink)
.then(() => loadScript(appData.StaticAppJsLink)) .then(() => loadScript(appData.StaticAppJsLink))

View file

@ -22,11 +22,7 @@
<body id="rl-app" data-admin='{{BaseAppAdmin}}'> <body id="rl-app" data-admin='{{BaseAppAdmin}}'>
<div id="rl-loading"> <div id="rl-loading">
<div id="rl-loading-desc">{{LoadingDescriptionEsc}}</div> <div id="rl-loading-desc">{{LoadingDescriptionEsc}}</div>
<div class="e-spinner"> <i class="icon-spinner"></i>
<div></div>
<div></div>
<div></div>
</div>
</div> </div>
<div id="rl-loading-error" hidden="">An error occurred.<br>Please refresh the page and try again.</div> <div id="rl-loading-error" hidden="">An error occurred.<br>Please refresh the page and try again.</div>
<div id="rl-content" hidden=""> <div id="rl-content" hidden="">