🐛 allow mnml.listen('ready') to work when called by an async script

dryan · Apr 6, 2023 · 343eccc · 343eccc
1 parent 39d4315
commit 343eccc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/package.json b/package.json
@@ -9,9 +9,9 @@
     "test": "echo \"Error: no test specified\" && exit 0",
     "clean": "rimraf dist",
     "prebuild": "npm run clean",
-    "build": "tsc --project tsconfig.json && uglifyjs dist/mnml.js -o dist/mnml.min.js --compress --comments --source-map \"url=mnml.min.js.map,includeSources\"",
-    "postbuild": "MNML_VERSION=$(node -pe \"require('./package.json').version\") && cat dist/mnml.js | sed -E \"s/@version/@version $MNML_VERSION/g\" | tee dist/mnml.js > /dev/null && cat dist/mnml.min.js | sed -E \"s/@version/@version $MNML_VERSION/g\" | tee dist/mnml.min.js > /dev/null",
-    "watch": "npm run build -- --watch",
+    "build": "tsc --project tsconfig.json",
+    "postbuild": "uglifyjs dist/mnml.js -o dist/mnml.min.js --compress --comments --source-map \"url=mnml.min.js.map,includeSources\" && MNML_VERSION=$(node -pe \"require('./package.json').version\") && cat dist/mnml.js | sed -E \"s/@version/@version $MNML_VERSION/g\" | tee dist/mnml.js > /dev/null && cat dist/mnml.min.js | sed -E \"s/@version/@version $MNML_VERSION/g\" | tee dist/mnml.min.js > /dev/null",
+    "dev": "npm run build -- --watch",
     "prepublish": "npm run build"
   },
   "author": "dryan <[email protected]>",

diff --git a/src/mnml.ts b/src/mnml.ts
@@ -135,13 +135,12 @@ export const mnml = (() => {
 
   const _readyListener = (callback: MnmlEventCallback, priority?: number): any => {
     priority = priority || 10;
-    if (_readyListener.loaded) {
-      return callback();
+    if (document.readyState === "loading") {
+      return _readyListener.queue.push([callback, priority]);
     }
-    _readyListener.queue.push([callback, priority]);
+    return callback();
   };
   _readyListener.queue = [] as Array<[MnmlEventCallback, number]>;
-  _readyListener.loaded = false;
   document.addEventListener("DOMContentLoaded", () => {
     _readyListener.queue = _readyListener.queue.sort((a, b) => a[1] - b[1]);
     while (_readyListener.queue.length) {
@@ -150,7 +149,6 @@ export const mnml = (() => {
         cb[0]();
       }
     }
-    _readyListener.loaded = true;
   });
 
   function listen(