Skip to content

Commit

Permalink
Speedup boot
Browse files Browse the repository at this point in the history
  • Loading branch information
djmaze committed Sep 23, 2021
1 parent 9158fcd commit 7cb24d4
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 19 deletions.
18 changes: 7 additions & 11 deletions dev/boot.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,29 +49,25 @@ let RL_APP_DATA = {};
win.rl = {
adminArea: () => admin,
settings: {
get: name => null == RL_APP_DATA[name] ? null : RL_APP_DATA[name],
get: name => RL_APP_DATA[name],
set: (name, value) => RL_APP_DATA[name] = value,
app: name => {
const APP_SETTINGS = RL_APP_DATA.System || {};
return null == APP_SETTINGS[name] ? null : APP_SETTINGS[name];
},
capa: name => name && Array.isArray(RL_APP_DATA.Capa) && RL_APP_DATA.Capa.includes(name)
app: name => RL_APP_DATA.System[name],
capa: name => name && (RL_APP_DATA.Capa || []).includes(name)
},
setWindowTitle: title =>
doc.title = RL_APP_DATA.Title ? (title ? title + ' - ' : '') + RL_APP_DATA.Title : (title ? '' + title : ''),

initData: appData => {
const cb = () => rl.app.bootstart();
RL_APP_DATA = appData;
appData
? loadScript(appData.StaticLibJsLink)
loadScript(appData.StaticLibJsLink)
.then(() => loadScript(appData.StaticAppJsLink))
.then(() => appData.PluginsLink ? loadScript(appData.PluginsLink) : Promise.resolve())
.then(() => win.__APP_BOOT())
.then(() => ('loading' !== doc.readyState) ? cb() : doc.addEventListener('DOMContentLoaded', cb))
.catch(e => {
showError(e.message);
throw e;
})
: showError();
});
}
};

Expand Down
9 changes: 1 addition & 8 deletions dev/bootstrap.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { doc, dropdownVisibility, Settings } from 'Common/Globals';
import { dropdownVisibility, Settings } from 'Common/Globals';
import { i18n } from 'Common/Translator';

import { root } from 'Common/Links';
Expand Down Expand Up @@ -111,11 +111,4 @@ export default App => {
});
};

window.__APP_BOOT = () => {
const cb = () => {
window.__APP_BOOT = null;
App.bootstart();
};
('loading' !== doc.readyState) ? cb() : doc.addEventListener('DOMContentLoaded', cb);
};
};

0 comments on commit 7cb24d4

Please sign in to comment.