L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-64749' of https://github.com/mkassaei/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2019-02-20 17:01:56 +01:00
parent 064f3345f8 3e697596b4
commit cb8fc12489
2 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
question/type/gapselect/renderer.php
+2 -10
View File
@@ -71,17 +71,9 @@ class qtype_gapselect_renderer extends qtype_elements_embedded_in_question_text_
}
}
// If the text is short use non-breaking space.
$choose = ' ';
foreach ($selectoptions as $key => $text) {
if (strlen(get_string('choosedots')) / 2 <= strlen($text)) {
$choose = get_string('choosedots');
break;
}
}
// Use non-breaking space instead of 'Choose...'.
$selecthtml = html_writer::select($selectoptions, $qa->get_qt_field_name($fieldname),
$value, $choose, $attributes) . ' ' . $feedbackimage;
$value, '&nbsp;', $attributes) . ' ' . $feedbackimage;
return html_writer::tag('span', $selecthtml, array('class' => 'control '.$groupclass));
}
question/type/gapselect/tests/walkthrough_test.php
+2 -2
View File
@@ -60,9 +60,9 @@ class qtype_gapselect_walkthrough_test extends qbehaviour_walkthrough_test_base
// Also note the ' ' in the p2 example below is a nbsp (used when names are short).
$this->check_output_contains_selectoptions(
$this->get_contains_select_expectation('p1',
['' => get_string('choosedots'), '1' => 'quick', '2' => 'slow'], null, true),
['0' => '&nbsp;', '1' => 'quick', '2' => 'slow'], null, true),
$this->get_contains_select_expectation('p2',
['' => ' ', '1' => 'fox', '2' => 'dog'], null, true),
['0' => '&nbsp;', '1' => 'fox', '2' => 'dog'], null, true),
$this->get_contains_select_expectation('p3',
['1' => 'lazy', '2' => 'assiduous'], null, true));