Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-29 20:19:22 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bugfix CSP handling Nextcloud<24 for #631 and #633

Browse source
This commit is contained in:
the-djmaze 2022-11-06 23:10:34 +01:00
parent e0320c63c1
commit 529d727189
2 changed files with 22 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

17
dev/boot.js
View file

@ -9,6 +9,13 @@ const
layout = doc.cookie.match(/(^|;) ?rllayout=([^;]+)/) || '',
badBrowser = () => doc.location.replace('./?/BadBrowser'),
showError = msg => {
let div = eId('loading-error');
div.append(' ' + msg);
eId('loading').hidden = true;
div.hidden = false;
},
loadScript = src => {
if (!src) {
throw new Error('src should not be empty.');
@ -44,13 +51,7 @@ window.rl = {
initData: appData => {
RL_APP_DATA = appData;
const url = appData.StaticLibsJs,
cb = () => rl.app ? rl.app.bootstart() : badBrowser(),
div = eId('loading-error'),
showError = msg => {
div.append(' ' + msg);
eId('loading').hidden = true;
div.hidden = false;
};
cb = () => rl.app ? rl.app.bootstart() : badBrowser();
loadScript(url)
.then(() => loadScript(url.replace('/libs.', `/${admin?'admin':'app'}.`)))
.then(() => appData.PluginsLink ? loadScript(appData.PluginsLink) : Promise.resolve())
@ -73,6 +74,6 @@ window.rl = {
};
loadScript(`./?/${admin ? 'Admin' : ''}AppData/0/${Math.random().toString().slice(2)}/`)
.then(() => 0);
.catch(e => showError(e));
})(document);