From a13de9021220d2dc911c27635b8cacbbcc26792f Mon Sep 17 00:00:00 2001 From: Andrew Nicols Date: Mon, 1 Nov 2021 12:17:34 +0800 Subject: [PATCH 1/1] MDL-72569 course: Reduce jquery --- course/format/amd/src/local/content/actions.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/course/format/amd/src/local/content/actions.js b/course/format/amd/src/local/content/actions.js index d54e7e5d89..2eb905b965 100644 --- a/course/format/amd/src/local/content/actions.js +++ b/course/format/amd/src/local/content/actions.js @@ -253,14 +253,16 @@ export default class extends BaseComponent { } ); - // Open the cm section node if possible (Bootstrap 4 uses jQuery to interact with collapsibles). + // Open the cm section node if possible. const sectionnode = currentElement.closest(this.selectors.SECTIONNODE); - const toggler = jQuery(sectionnode).find(this.selectors.MODALTOGGLER); - let collapsibleId = toggler.data('target') ?? toggler.attr('href'); + const toggler = sectionnode.querySelector(this.selectors.MODALTOGGLER); + + // We cannot be sure we have # in the id element name. + const collapsibleId = (toggler.dataset.target ?? toggler.hash)?.replace('#', ''); if (collapsibleId) { - // We cannot be sure we have # in the id element name. - collapsibleId = collapsibleId.replace('#', ''); - jQuery(`#${collapsibleId}`).collapse('toggle'); + // Bootstrap 4 uses jQuery. + // TODO Convert to native in MDL-79179. + jQuery(`#${collapsibleId}`).collapse('show'); } // Capture click. -- 2.30.0