Merge branch 'MDL-78288-master' of https://github.com/aanabit/moodle

sarjona · Jul 13, 2023 · 2e78301 · 2e78301
2 parents 844257a + 13857d4
commit 2e78301
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 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
@@ -28,6 +28,7 @@ import Pending from 'core/pending';
 const SELECTORS = {
     FORMHEADER: '.fheader',
     FORMCONTAINER: '.fcontainer',
+    FIELDSET: 'fieldset',
 };
 
 const CLASSES = {
@@ -56,8 +57,8 @@ export const init = collapsesections => {
     // Override default collapse class if all visible containers are expanded on page load
     let formcontainercount = 0;
     $(SELECTORS.FORMCONTAINER).each((_, container) => {
-        if (!container.classList.contains(CLASSES.HIDDEN) &&
-        !container.parentElement.classList.contains(CLASSES.HIDDEN)) {
+        const parentFieldset = container.closest(SELECTORS.FIELDSET);
+        if (parentFieldset == container.parentElement && !parentFieldset.classList.contains(CLASSES.HIDDEN)) {
             formcontainercount++;
         }
     });