diff --git a/src/javascript/utils/aniwatchCore.js b/src/javascript/utils/aniwatchCore.js index f6c2103..abe5afa 100644 --- a/src/javascript/utils/aniwatchCore.js +++ b/src/javascript/utils/aniwatchCore.js @@ -1,3 +1,5 @@ +import * as helper from './helpers'; + let __scripts = []; let __afterLoadScripts = []; @@ -16,7 +18,7 @@ export function initCore() { attributes: true }); - document.addEventListener("DOMContentLoaded", event => awaitPageLoaded(), false); + helper.onReady(() => awaitPageLoaded()); } export function registerScript(func, pattern = '.*') { diff --git a/src/javascript/utils/helpers.js b/src/javascript/utils/helpers.js index 6265b3a..a52968e 100644 --- a/src/javascript/utils/helpers.js +++ b/src/javascript/utils/helpers.js @@ -10,6 +10,14 @@ export function initHelpers() { document.addEventListener('keyup', event => handleKeyUp(event)); } +export function onReady(fn) { + if (document.readyState != 'loading') { + fn(); + } else { + document.addEventListener('DOMContentLoaded', fn); + } +} + function handleKeyDown(event) { handleKeyToggle(event, true); }