Reduce some JavaScript

This commit is contained in:
the-djmaze 2023-02-22 17:43:54 +01:00
parent f023a0799c
commit 97282075b0
2 changed files with 12 additions and 18 deletions

View file

@ -19,7 +19,6 @@ AppUserStore.focusedState.subscribe(value => {
arePopupsVisible() || keyScope(value); arePopupsVisible() || keyScope(value);
ThemeStore.isMobile() && leftPanelDisabled('FolderList' !== value); ThemeStore.isMobile() && leftPanelDisabled('FolderList' !== value);
} }
let dom = elementById('V-Mail'+name); elementById('V-Mail'+name).classList.toggle('focused', name === value);
dom?.classList.toggle('focused', name === value);
}); });
}); });

View file

@ -3,30 +3,27 @@
const const
qUri = path => doc.location.pathname.replace(/\/+$/,'') + '/?/' + path, qUri = path => doc.location.pathname.replace(/\/+$/,'') + '/?/' + path,
eId = id => doc.getElementById('rl-'+id), eId = id => doc.getElementById('rl-'+id),
app = eId('app'), admin = '1' == eId('app')?.dataset?.admin,
admin = app && '1' == app.dataset.admin,
layout = doc.cookie.match(/(^|;) ?rllayout=([^;]+)/) || '', layout = doc.cookie.match(/(^|;) ?rllayout=([^;]+)/) || '',
showError = msg => { toggle = div => {
let div = eId('loading-error');
div.append(msg);
eId('loading').hidden = true; eId('loading').hidden = true;
div.hidden = false; div.hidden = false;
}, },
showError = msg => {
let div = eId('loading-error');
div.append(msg);
toggle(div);
},
loadScript = src => { loadScript = src => src ? new Promise((resolve, reject) => {
if (!src) {
throw new Error('src should not be empty.');
}
return new Promise((resolve, reject) => {
const script = doc.createElement('script'); const script = doc.createElement('script');
script.onload = () => resolve(); script.onload = () => resolve();
script.onerror = () => reject('Failed loading ' + src); script.onerror = () => reject('Failed loading ' + src);
script.src = src; script.src = src;
// script.async = true; // script.async = true;
doc.head.append(script); doc.head.append(script);
}); }) : Promise.reject('src is empty');
};
try { try {
let smctoken = doc.cookie.match(/(^|;) ?smctoken=([^;]+)/); let smctoken = doc.cookie.match(/(^|;) ?smctoken=([^;]+)/);
@ -138,11 +135,9 @@ window.rl = {
}; };
if (!navigator.cookieEnabled) { if (!navigator.cookieEnabled) {
eId('loading').hidden = true; toggle(eId('NoCookie'));
eId('NoCookie').hidden = false;
} else if (![].flat) { } else if (![].flat) {
eId('loading').hidden = true; toggle(eId('BadBrowser'));
eId('BadBrowser').hidden = false;
} else { } else {
rl.fetchJSON(qUri(`${admin ? 'Admin' : ''}AppData/0/${Math.random().toString().slice(2)}/`)) rl.fetchJSON(qUri(`${admin ? 'Admin' : ''}AppData/0/${Math.random().toString().slice(2)}/`))
.then(appData => { .then(appData => {