MDL-70004 qtype_multichoice: Set appropriate clear my choice role

moodle · Oct 27, 2020 · f61badb · f61badb
1 parent 5d357f9
commit f61badb
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/question/type/multichoice/amd/build/clearchoice.min.js b/question/type/multichoice/amd/build/clearchoice.min.js
diff --git a/question/type/multichoice/amd/build/clearchoice.min.js.map b/question/type/multichoice/amd/build/clearchoice.min.js.map
diff --git a/question/type/multichoice/amd/src/clearchoice.js b/question/type/multichoice/amd/src/clearchoice.js
@@ -25,7 +25,7 @@ define(['jquery', 'core/custom_interaction_events'], function($, CustomEvents) {
 
     var SELECTORS = {
         CHOICE_ELEMENT: '.answer input',
-        LINK: 'label',
+        LINK: 'a',
         RADIO: 'input[type="radio"]'
     };
 

diff --git a/question/type/multichoice/renderer.php b/question/type/multichoice/renderer.php
@@ -309,8 +309,9 @@ public function after_choices(question_attempt $qa, question_display_options $op
         }
         // Adds an hidden radio that will be checked to give the impression the choice has been cleared.
         $clearchoiceradio = html_writer::empty_tag('input', $clearchoiceradioattrs);
-        $clearchoiceradio .= html_writer::tag('label', get_string('clearchoice', 'qtype_multichoice'),
-            ['for' => $clearchoiceid, 'role' => 'button', 'tabindex' => $linktabindex]);
+        $clearchoice = html_writer::link('#', get_string('clearchoice', 'qtype_multichoice'),
+            ['tabindex' => $linktabindex, 'role' => 'button']);
+        $clearchoiceradio .= html_writer::label($clearchoice, $clearchoiceid);
 
         // Now wrap the radio and label inside a div.
         $result = html_writer::tag('div', $clearchoiceradio, $clearchoicewrapperattrs);