From f48f643e3f2e8989a0fcda01e0c4d3d1a84b52db Mon Sep 17 00:00:00 2001 From: moloko Date: Tue, 23 Mar 2021 10:12:35 +0000 Subject: [PATCH 1/3] search element's parents as well fixes #3097 --- src/core/js/a11y/browserFocus.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/core/js/a11y/browserFocus.js b/src/core/js/a11y/browserFocus.js index 58b24202a..cfb775067 100644 --- a/src/core/js/a11y/browserFocus.js +++ b/src/core/js/a11y/browserFocus.js @@ -62,7 +62,9 @@ export default class BrowserFocus extends Backbone.Controller { */ _onClick(event) { const $element = $(event.target); - if ($element.is('[aria-disabled=true]')) { + // search elemenent and parents for aria-disabled - see https://github.com/adaptlearning/adapt_framework/issues/3097 + const isAriaDisabled = $element.closest('[aria-disabled=true]') > 0; + if (isAriaDisabled) { event.preventDefault(); event.stopImmediatePropagation(); } From e3e4afa2d1af44874d23a398bf86be9ce96db071 Mon Sep 17 00:00:00 2001 From: moloko Date: Tue, 23 Mar 2021 11:57:39 +0000 Subject: [PATCH 2/3] add missing 'length' property --- src/core/js/a11y/browserFocus.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/js/a11y/browserFocus.js b/src/core/js/a11y/browserFocus.js index cfb775067..8a5e60f7c 100644 --- a/src/core/js/a11y/browserFocus.js +++ b/src/core/js/a11y/browserFocus.js @@ -63,7 +63,7 @@ export default class BrowserFocus extends Backbone.Controller { _onClick(event) { const $element = $(event.target); // search elemenent and parents for aria-disabled - see https://github.com/adaptlearning/adapt_framework/issues/3097 - const isAriaDisabled = $element.closest('[aria-disabled=true]') > 0; + const isAriaDisabled = $element.closest('[aria-disabled=true]').length > 0; if (isAriaDisabled) { event.preventDefault(); event.stopImmediatePropagation(); From fb09845bab71e907963d2d75edccaf89202fbaa9 Mon Sep 17 00:00:00 2001 From: moloko Date: Tue, 23 Mar 2021 12:12:31 +0000 Subject: [PATCH 3/3] correct typo in comment change length check --- src/core/js/a11y/browserFocus.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/js/a11y/browserFocus.js b/src/core/js/a11y/browserFocus.js index 8a5e60f7c..668c279d8 100644 --- a/src/core/js/a11y/browserFocus.js +++ b/src/core/js/a11y/browserFocus.js @@ -62,8 +62,8 @@ export default class BrowserFocus extends Backbone.Controller { */ _onClick(event) { const $element = $(event.target); - // search elemenent and parents for aria-disabled - see https://github.com/adaptlearning/adapt_framework/issues/3097 - const isAriaDisabled = $element.closest('[aria-disabled=true]').length > 0; + // search element and parents for aria-disabled - see https://github.com/adaptlearning/adapt_framework/issues/3097 + const isAriaDisabled = $element.closest('[aria-disabled=true]').length === 1; if (isAriaDisabled) { event.preventDefault(); event.stopImmediatePropagation();