MDL-74073 core_form: Set aria-expanded values for expand/collapse all

moodle · Mar 16, 2022 · 576020c · 576020c
1 parent ed0dacb
commit 576020c
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 2 deletions.
diff --git a/course/renderer.php b/course/renderer.php
@@ -1699,7 +1699,7 @@ protected function coursecat_tree(coursecat_helper $chelper, $coursecat) {
 
             // Only show the collapse/expand if there are children to expand.
             $content .= html_writer::start_tag('div', array('class' => 'collapsible-actions'));
-            $content .= html_writer::link('#', $linkname, array('class' => implode(' ', $classes)));
+            $content .= html_writer::link('#', $linkname, array('class' => implode(' ', $classes), 'aria-expanded' => false));
             $content .= html_writer::end_tag('div');
             $this->page->requires->strings_for_js(array('collapseall', 'expandall'), 'moodle');
         }

diff --git a/lib/form/yui/build/moodle-form-shortforms/moodle-form-shortforms-debug.js b/lib/form/yui/build/moodle-form-shortforms/moodle-form-shortforms-debug.js
@@ -228,9 +228,11 @@ Y.extend(SHORTFORMS, Y.Base, {
         // Updating the button.
         if (expandbtn) {
             btn.removeClass(CSS.COLLAPSEALL);
+            btn.setAttribute('aria-expanded', false);
             btn.setHTML(M.util.get_string('expandall', 'moodle'));
         } else {
             btn.addClass(CSS.COLLAPSEALL);
+            btn.setAttribute('aria-expanded', true);
             btn.setHTML(M.util.get_string('collapseall', 'moodle'));
         }
 

diff --git a/lib/form/yui/build/moodle-form-shortforms/moodle-form-shortforms-min.js b/lib/form/yui/build/moodle-form-shortforms/moodle-form-shortforms-min.js
diff --git a/lib/form/yui/build/moodle-form-shortforms/moodle-form-shortforms.js b/lib/form/yui/build/moodle-form-shortforms/moodle-form-shortforms.js
@@ -225,9 +225,11 @@ Y.extend(SHORTFORMS, Y.Base, {
         // Updating the button.
         if (expandbtn) {
             btn.removeClass(CSS.COLLAPSEALL);
+            btn.setAttribute('aria-expanded', false);
             btn.setHTML(M.util.get_string('expandall', 'moodle'));
         } else {
             btn.addClass(CSS.COLLAPSEALL);
+            btn.setAttribute('aria-expanded', true);
             btn.setHTML(M.util.get_string('collapseall', 'moodle'));
         }
 

diff --git a/lib/form/yui/src/shortforms/js/shortforms.js b/lib/form/yui/src/shortforms/js/shortforms.js
@@ -226,9 +226,11 @@ Y.extend(SHORTFORMS, Y.Base, {
         // Updating the button.
         if (expandbtn) {
             btn.removeClass(CSS.COLLAPSEALL);
+            btn.setAttribute('aria-expanded', false);
             btn.setHTML(M.util.get_string('expandall', 'moodle'));
         } else {
             btn.addClass(CSS.COLLAPSEALL);
+            btn.setAttribute('aria-expanded', true);
             btn.setHTML(M.util.get_string('collapseall', 'moodle'));
         }