#23 Run script directly if page already loaded #24

Merged
Serraniel merged 2 commits from bugfix/#23-runAfterLoad-only-works-if-called-before-page-loaded into develop 2020-08-21 16:22:40 +02:00

View file

@ -27,16 +27,34 @@ observer.observe(document.documentElement || document.body, {
attributes: true
});
function findPreloader() {
return document.getElementById('preloader');
}
function runAfterLoad(func, pattern = '.*') {
let preloader = findPreloader();
if (typeof preloader !== undefined && preloader.style.display !== "none") {
__afterLoadScripts.push({ "function": func, "pattern": pattern });
} else {
func();
}
}
document.addEventListener("DOMContentLoaded", event => awaitPageLoaded(), false);
function awaitPageLoaded() {
let preLoader = document.getElementById('preloader');
let preLoader = findPreloader();
let runScripts = () => {
__afterLoadScripts.forEach(script => {
if (window.location.pathname.match(script.pattern)) {
script.function();
}
});
};
if (typeof preLoader === 'undefined') {
runScripts();
return;
}
@ -44,11 +62,7 @@ function awaitPageLoaded() {
if (preLoader.style.display === "none") {
clearInterval(loop);
__afterLoadScripts.forEach(script => {
if (window.location.pathname.match(script.pattern)) {
script.function();
}
})
runScripts();
}
}, 100);
}