From b24f13eca2a09c5b84b434c3366b8df7be0e30ab Mon Sep 17 00:00:00 2001 From: Shamim Rezaie Date: Thu, 17 Sep 2020 02:43:18 +1000 Subject: [PATCH] MDL-69301 course: Remove custom keyboard navigation code --- .../local/activitychooser/dialogue.min.js | Bin 12198 -> 11005 bytes .../local/activitychooser/dialogue.min.js.map | Bin 44684 -> 38947 bytes .../local/activitychooser/selectors.min.js | Bin 2265 -> 2166 bytes .../activitychooser/selectors.min.js.map | Bin 7176 -> 6880 bytes .../amd/src/local/activitychooser/dialogue.js | 72 ------------------ .../src/local/activitychooser/selectors.js | 2 - 6 files changed, 74 deletions(-) diff --git a/course/amd/build/local/activitychooser/dialogue.min.js b/course/amd/build/local/activitychooser/dialogue.min.js index d517d5b68fa86f2cd55cd28cacb18f09a6ce76d8..8028476a932693d05cfa826ca9fceae09ae23f92 100644 GIT binary patch delta 272 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 delta 77 zcmew+a8q!@HfGJD)a3l!+|<03)Rd6KB)`Nmt0WDjqSW-v{5&NcAOkKtc{Ot?Ur}mt UerZv1Dn#kzbu40=Sy>8M0Es>vg8%>k diff --git a/course/amd/build/local/activitychooser/selectors.min.js.map b/course/amd/build/local/activitychooser/selectors.min.js.map index 13f9e9f9fcc55f6931be5a25668b533c8573805e..25b6d79c3f1c00e34b2bb681f3558de9148bc62a 100644 GIT binary patch delta 539 zcmYjM%`O8`6i$WC%q2~U7BPgd;wFCDMlB@HxrRt?Q$Gtck~Ba@wG0~~V!;1%i4PEx?^{vx(f zQ6-cm{9D6|7*BzM?b3s#n9SFi}HUL%s*F zM}3w{&z99+$GYxnpll%D2iT`o%N%BwBS(9%NLB4*Dd z+jylT^C$)X8m2ocqq5_jBc}@}ZPU$3Z;`!=QB- z9MY{+fyF@*b>n(4dYJk=$xo*f&WXm6Z28*wRCbi3E+BcV7Td}oQQC5)Km6>^KnpnI&u3xsxyT7iy zXQH;lw*a;bryfEkbcfB;N9L`>Y+3n_ zk|V)405(iW+sOG%TYmdU_o>Pkf-7ay5V0kymUz_E#EwiZM0X6~kN?4Av%e#u`; { - // Set up the tab handlers. - const favTabNav = body.querySelector(selectors.regions.favouriteTabNav); - const recommendedTabNav = body.querySelector(selectors.regions.recommendedTabNav); - const defaultTabNav = body.querySelector(selectors.regions.defaultTabNav); - const activityTabNav = body.querySelector(selectors.regions.activityTabNav); - const resourceTabNav = body.querySelector(selectors.regions.resourceTabNav); - const tabNavArray = [favTabNav, recommendedTabNav, defaultTabNav, activityTabNav, resourceTabNav]; - tabNavArray.forEach((element) => { - return element.addEventListener('keydown', (e) => { - // The first visible navigation tab link. - const firstLink = e.target.parentElement.querySelector(selectors.elements.visibletabs); - // The last navigation tab link. It would always be the default activities tab link. - const lastLink = e.target.parentElement.lastElementChild; - - if (e.keyCode === arrowRight) { - const nextLink = e.target.nextElementSibling; - if (nextLink === null) { - e.target.tabIndex = -1; - firstLink.tabIndex = 0; - firstLink.focus(); - } else if (nextLink.classList.contains('d-none')) { - e.target.tabIndex = -1; - lastLink.tabIndex = 0; - lastLink.focus(); - } else { - e.target.tabIndex = -1; - nextLink.tabIndex = 0; - nextLink.focus(); - } - } - if (e.keyCode === arrowLeft) { - const previousLink = e.target.previousElementSibling; - if (previousLink === null) { - e.target.tabIndex = -1; - lastLink.tabIndex = 0; - lastLink.focus(); - } else if (previousLink.classList.contains('d-none')) { - e.target.tabIndex = -1; - firstLink.tabIndex = 0; - firstLink.focus(); - } else { - e.target.tabIndex = -1; - previousLink.tabIndex = 0; - previousLink.focus(); - } - } - if (e.keyCode === home) { - e.target.tabIndex = -1; - firstLink.tabIndex = 0; - firstLink.focus(); - } - if (e.keyCode === end) { - e.target.tabIndex = -1; - lastLink.tabIndex = 0; - lastLink.focus(); - } - if (e.keyCode === space) { - e.preventDefault(); - e.target.click(); - } - }); - }); -}; - /** * Initialise the keyboard navigation controls for the chooser options. * diff --git a/course/amd/src/local/activitychooser/selectors.js b/course/amd/src/local/activitychooser/selectors.js index dd20e756c9f..34e9adb112f 100644 --- a/course/amd/src/local/activitychooser/selectors.js +++ b/course/amd/src/local/activitychooser/selectors.js @@ -52,10 +52,8 @@ export default { help: getDataSelector('region', 'help'), modules: getDataSelector('region', 'modules'), favouriteTabNav: getDataSelector('region', 'favourite-tab-nav'), - recommendedTabNav: getDataSelector('region', 'recommended-tab-nav'), defaultTabNav: getDataSelector('region', 'default-tab-nav'), activityTabNav: getDataSelector('region', 'activity-tab-nav'), - resourceTabNav: getDataSelector('region', 'resources-tab-nav'), favouriteTab: getDataSelector('region', 'favourites'), recommendedTab: getDataSelector('region', 'recommended'), defaultTab: getDataSelector('region', 'default'), -- 2.17.1