Merge branch 'MDL-75784-400' of https://github.com/JBThong/moodle int…

…o MOODLE_400_STABLE
moodle · Nov 4, 2022 · d0c489d · d0c489d
2 parents dc02b1b + 744cd41
commit d0c489d
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/lib/form/amd/build/collapsesections.min.js b/lib/form/amd/build/collapsesections.min.js
diff --git a/lib/form/amd/build/collapsesections.min.js.map b/lib/form/amd/build/collapsesections.min.js.map
diff --git a/lib/form/amd/src/collapsesections.js b/lib/form/amd/src/collapsesections.js
@@ -44,6 +44,7 @@ export const init = collapsesections => {
     // All jQuery in this code can be replaced when MDL-71979 is integrated (move to Bootstrap 5).
     const pendingPromise = new Pending('core_form/collapsesections');
     const collapsemenu = document.querySelector(collapsesections);
+    const formParent = collapsemenu.closest('form');
     collapsemenu.addEventListener('keydown', e => {
         if (e.key === 'Enter' || e.key === ' ') {
             e.preventDefault();
@@ -71,7 +72,7 @@ export const init = collapsesections => {
             action = 'show';
         }
 
-        document.querySelectorAll(SELECTORS.FORMCONTAINER).forEach((collapsecontainer) => {
+        formParent.querySelectorAll(SELECTORS.FORMCONTAINER).forEach((collapsecontainer) => {
             $(collapsecontainer).collapse(action);
         });
     });
@@ -85,26 +86,29 @@ export const init = collapsesections => {
     collapsemenu.setAttribute('aria-controls', collapseElementIds.join(' '));
 
     $(SELECTORS.FORMCONTAINER).on('hidden.bs.collapse', () => {
-        let allcollapsed = true;
-        $(SELECTORS.FORMCONTAINER).each((_, collapsecontainer) => {
+        let allCollapsed = true;
+
+        formParent.querySelectorAll(SELECTORS.FORMCONTAINER).forEach((collapsecontainer) => {
             if (collapsecontainer.classList.contains(CLASSES.SHOW)) {
-                allcollapsed = false;
+                allCollapsed = false;
             }
         });
-        if (allcollapsed) {
+
+        if (allCollapsed) {
             collapsemenu.classList.add(CLASSES.COLLAPSED);
             collapsemenu.setAttribute('aria-expanded', false);
         }
     });
     $(SELECTORS.FORMCONTAINER).on('shown.bs.collapse', () => {
-        var allexpanded = true;
-        $(SELECTORS.FORMCONTAINER).each((_, collapsecontainer) => {
+        let allExpanded = true;
+
+        formParent.querySelectorAll(SELECTORS.FORMCONTAINER).forEach((collapsecontainer) => {
             if (!collapsecontainer.classList.contains(CLASSES.SHOW)) {
-                allexpanded = false;
+                allExpanded = false;
             }
         });
 
-        if (allexpanded) {
+        if (allExpanded) {
             collapsemenu.classList.remove(CLASSES.COLLAPSED);
             collapsemenu.setAttribute('aria-expanded', true);
         }