Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enhancement: Retry frontend highlighter init later #829

Merged
merged 4 commits into from
Dec 19, 2024
Merged

Enhancement: Retry frontend highlighter init later #829

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7eaf5f4
Move the required init functions to dedicated function with has run flag
pattonwebz Dec 9, 2024
771d683
Add a later listener on 'load' to retry init incase it didn't run on …
pattonwebz Dec 9, 2024
cc771a3
Combine the event listeners to DRY the change
pattonwebz Dec 9, 2024
204c511
Use better variable name
pattonwebz Dec 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions src/frontendHighlighterApp/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -891,9 +891,20 @@ class AccessibilityCheckerHighlight {
}
}

window.addEventListener( 'DOMContentLoaded', () => {
new AccessibilityCheckerHighlight();
if ( window.edacFrontendHighlighterApp?.userCanFix ) {
fixSettingsModalInit();
// Some systems (Cloudflare Rocket Loader) defers scripts for performance but that can
// cause some DOMContentLoaded events to be missed. This is flag tracks if it run so we
// can retry at a latter event listener.
let highlighterInitialized = false;
const initHighlighter = () => {
if ( ! highlighterInitialized ) {
new AccessibilityCheckerHighlight();
if ( window.edacFrontendHighlighterApp?.userCanFix ) {
fixSettingsModalInit();
}
highlighterInitialized = true;
}
};

[ 'DOMContentLoaded', 'load' ].forEach( ( event ) => {
window.addEventListener( event, initHighlighter );
} );
Loading