🐛 fix(a11y-init.js): fix bug in subsequent tests after clearing results

✨ feat(a11y-init.js): encapsulate A11yTester class and improve separation of concerns for greater extensibility 📝 docs(readme.txt): update changelog for version 1.0.9, fix bug in subsequent tests after clearing results
skullzarmy · Oct 28, 2023 · 177e45c · 177e45c
1 parent 37569ee
commit 177e45c
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 10 deletions.
diff --git a/a11y-init.js b/a11y-init.js
@@ -84,22 +84,31 @@ class A11yTester {
         return parser.parseFromString(text, "text/html");
     }
 
+    executeAxe(iframe, resolve, reject) {
+        iframe.contentWindow.axe.run((err, results) => {
+            if (err) {
+                reject(err);
+            } else {
+                this.handleTestResults(results);
+                document.body.removeChild(iframe);
+                resolve();
+            }
+        });
+    }
+
     async runAxeTest(docContent) {
         const iframe = this.createIframe(docContent);
         await this.injectAxeScript(iframe);
 
         return new Promise((resolve, reject) => {
-            iframe.contentWindow.addEventListener("DOMContentLoaded", () => {
-                iframe.contentWindow.axe.run((err, results) => {
-                    if (err) {
-                        reject(err);
-                    } else {
-                        this.handleTestResults(results);
-                        document.body.removeChild(iframe);
-                        resolve();
-                    }
+            if (iframe.contentWindow.document.readyState === "loading") {
+                iframe.contentWindow.addEventListener("DOMContentLoaded", () => {
+                    this.executeAxe(iframe, resolve, reject);
                 });
-            });
+            } else {
+                // Document already loaded
+                this.executeAxe(iframe, resolve, reject);
+            }
         }).catch((err) => {
             this.handleError(err);
         });

diff --git a/readme.txt b/readme.txt
@@ -95,6 +95,9 @@ Initial release, no upgrades required.
 = 1.0.8 =
 * Refactored a11y-init.js with encapsulating class and better separation of concerns for greater extensibility.
 
+= 1.0.9 =
+* Fixed bug in subsequent tests after clearing results
+
 == License ==
 
 This WordPress Plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License or any later version.
@@ -107,6 +110,9 @@ Contributions, issues, and feature requests are welcome! For support, visit the
 
 == Changelog ==
 
+= 1.0.9 =
+* Fixed bug in subsequent tests after clearing results
+
 = 1.0.8 =
 * Refactored a11y-init.js with encapsulating class and better separation of concerns for greater extensibility.