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

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
djmaze 2020-07-13 11:40:49 +02:00
commit 85155a9895
17 changed files with 286 additions and 245 deletions
Download patch file Download diff file Expand all files Collapse all files

33
dev/Common/Booter.js
View file

@ -66,7 +66,17 @@ function getComputedStyle(id, name) {
* @returns {void}
*/
function includeStyle(styles) {
window.document.write(unescape('%3Csty' + 'le%3E' + styles + '"%3E%3C/' + 'sty' + 'le%3E')); // eslint-disable-line no-useless-concat
const style = window.document.createElement('style');
style.type = 'text/css';
style.text = styles;
if (style.styleSheet) {
style.styleSheet.cssText = styles;
} else {
style.appendChild(window.document.createTextNode(styles));
}
window.document.getElementsByTagName('head')[0].appendChild(style);
}
/**
@ -74,19 +84,11 @@ function includeStyle(styles) {
* @returns {void}
*/
function includeScr(src) {
window.document.write(
unescape(
'%3Csc' +
'ript type="text/jav' +
'ascr' +
'ipt" data-cfasync="false" sr' +
'c="' +
src +
'"%3E%3C/' +
'scr' +
'ipt%3E'
)
); // eslint-disable-line no-useless-concat
const script = window.document.createElement('script');
script.type = 'text/javascript';
script.src = src;
window.document.getElementsByTagName('head')[0].appendChild(script);
}
/**
@ -217,7 +219,6 @@ function runApp() {
jassl &&
progressJs &&
appData &&
appData.TemplatesLink &&
appData.LangLink &&
appData.StaticLibJsLink &&
appData.StaticAppJsLink &&
@ -250,7 +251,7 @@ function runApp() {
libs()
.then(() => {
p.set(20);
return window.Promise.all([jassl(appData.TemplatesLink), jassl(appData.LangLink)]);
return jassl(appData.LangLink);
})
.then(() => {
p.set(30);

19
dev/bootstrap.js vendored
View file

@ -33,17 +33,22 @@ export default (App) => {
window.rl = rl;
const start = () => {
window.setTimeout(() => {
$html.removeClass('no-js rl-booted-trigger').addClass('rl-booted');
App.bootstart();
}, Enums.Magics.Time10ms);
};
window.__APP_BOOT = (fErrorCallback) => {
domReady(() => {
window.setTimeout(() => {
if (window.rainloopTEMPLATES && window.rainloopTEMPLATES[0]) {
if (window.document.getElementById('rainloop-templates-id')) {
start();
} else if (window.rainloopTEMPLATES && window.rainloopTEMPLATES[0]) {
window.document.getElementById('rl-templates').innerHTML = window.rainloopTEMPLATES[0];
window.setTimeout(() => {
$html.removeClass('no-js rl-booted-trigger').addClass('rl-booted');
App.bootstart();
}, Enums.Magics.Time10ms);
start();
} else {
fErrorCallback();
}