MDL-70288 qtype: Remove unnecessary empty label string

* When a label is passed to an (advanced) checkbox and no text was provided, the label will be displayed on the right of the the checkbox element. So there's no point in passing an empty string for the label just to render the text to the right of the checkbox.
moodle · Feb 2, 2021 · 2961feb · 2961feb
1 parent 793aa03
commit 2961feb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/question/type/ddimageortext/edit_ddimageortext_form.php b/question/type/ddimageortext/edit_ddimageortext_form.php
@@ -116,8 +116,7 @@ public function js_call() {
     protected function definition_draggable_items($mform, $itemrepeatsatstart) {
         $mform->addElement('header', 'draggableitemheader',
                                 get_string('draggableitems', 'qtype_ddimageortext'));
-        $mform->addElement('advcheckbox', 'shuffleanswers', ' ',
-                                get_string('shuffleimages', 'qtype_'.$this->qtype()));
+        $mform->addElement('advcheckbox', 'shuffleanswers', get_string('shuffleimages', 'qtype_'.$this->qtype()));
         $mform->setDefault('shuffleanswers', 0);
         $this->repeat_elements($this->draggable_item($mform), $itemrepeatsatstart,
                 $this->draggable_items_repeated_options(),
@@ -143,8 +142,7 @@ protected function draggable_item($mform) {
                                                 get_string('group', 'qtype_gapselect'),
                                                 $options,
                                                 array('class' => 'draggroup'));
-        $grouparray[] = $mform->createElement('advcheckbox', 'infinite', ' ',
-                get_string('infinite', 'qtype_ddimageortext'));
+        $grouparray[] = $mform->createElement('advcheckbox', 'infinite', get_string('infinite', 'qtype_ddimageortext'));
         $draggableimageitem[] = $mform->createElement('group', 'drags',
                 get_string('draggableitemheader', 'qtype_ddimageortext', '{no}'), $grouparray);
 

diff --git a/question/type/ddmarker/edit_ddmarker_form.php b/question/type/ddmarker/edit_ddmarker_form.php
@@ -44,8 +44,7 @@ public function qtype() {
     }
 
     protected function definition_inner($mform) {
-        $mform->addElement('advcheckbox', 'showmisplaced', ' ',
-                                                get_string('showmisplaced', 'qtype_ddmarker'));
+        $mform->addElement('advcheckbox', 'showmisplaced', get_string('showmisplaced', 'qtype_ddmarker'));
         parent::definition_inner($mform);
 
         $mform->addHelpButton('drops[0]', 'dropzones', 'qtype_ddmarker');
@@ -60,8 +59,7 @@ public function js_call() {
     protected function definition_draggable_items($mform, $itemrepeatsatstart) {
         $mform->addElement('header', 'draggableitemheader',
                                 get_string('markers', 'qtype_ddmarker'));
-        $mform->addElement('advcheckbox', 'shuffleanswers', ' ',
-                                        get_string('shuffleimages', 'qtype_'.$this->qtype()));
+        $mform->addElement('advcheckbox', 'shuffleanswers', get_string('shuffleimages', 'qtype_'.$this->qtype()));
         $mform->setDefault('shuffleanswers', 0);
         $this->repeat_elements($this->draggable_item($mform), $itemrepeatsatstart,
                 $this->draggable_items_repeated_options(),

diff --git a/question/type/ddwtos/edit_ddwtos_form.php b/question/type/ddwtos/edit_ddwtos_form.php
@@ -49,8 +49,7 @@ protected function data_preprocessing_choice($question, $answer, $key) {
 
     protected function choice_group($mform) {
         $grouparray = parent::choice_group($mform);
-        $grouparray[] = $mform->createElement('checkbox', 'infinite', ' ',
-                get_string('infinite', 'qtype_ddwtos'), null,
+        $grouparray[] = $mform->createElement('checkbox', 'infinite', get_string('infinite', 'qtype_ddwtos'), '', null,
                 array('size' => 1, 'class' => 'tweakcss'));
         return $grouparray;
     }