Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
5 changes: 4 additions & 1 deletion lib/core/public/load.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,10 @@ function runCommand(data, keepalive, callback) {
//a11y-engine iframe rules error merging logic
const errors = a11yEngine.getErrors();
if (Object.keys(errors).length !== 0) {
if (results[results.length - 1].a11yEngineErrors) {
if (
results.length > 0 &&
results[results.length - 1]?.a11yEngineErrors
) {
const error = results.pop();
delete error.a11yEngineErrors;
const mergedErrors = mergeErrors(error, errors);
Expand Down
5 changes: 4 additions & 1 deletion lib/core/public/run-rules.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,10 @@ export default function runRules(context, options, resolve, reject) {
// after should only run once, so ensure we are in the top level window
if (context.initiator) {
// Return a11y-engine errors when at top level window
if (results[results.length - 1].a11yEngineErrors) {
if (
results.length > 0 &&
results[results.length - 1]?.a11yEngineErrors
) {
const error = results.pop();
delete error.a11yEngineErrors;
a11yEngine.mergeErrors(error);
Expand Down
2 changes: 1 addition & 1 deletion lib/core/utils/merge-results.js
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ function mergeResults(frameResults, options) {

const frameSpec = getFrameSpec(frameResult);
// Extract existing errors and merge with new ones
if (results[results.length - 1].a11yEngineErrors) {
if (results.length > 0 && results[results.length - 1]?.a11yEngineErrors) {
const error = results.pop();
delete error.a11yEngineErrors;
mergedErrors = mergeErrors(mergedErrors, error, frameSpec);
Expand Down
Loading