MDL-47494 ddimageortext: Merge pull request #6 from timhunt/MOODLE_21_STABLE

Fix unit tests
This commit is contained in:
jamiepratt
2011-12-08 22:00:46 -08:00
3 changed files with 6 additions and 5 deletions
+3 -3
View File
@@ -51,14 +51,14 @@ class qtype_ddimageortext_drag_item {
public $text;
public $no;
public $group;
public $isinfinite;
public $infinite;
public function __construct($alttextlabel, $no, $group = 1, $isinfinite = false, $id = 0) {
public function __construct($alttextlabel, $no, $group = 1, $infinite = false, $id = 0) {
$this->id = $id;
$this->text = $alttextlabel;
$this->no = $no;
$this->group = $group;
$this->isinfinite = $isinfinite;
$this->infinite = $infinite;
}
public function choice_group() {
return $this->group;
+2 -1
View File
@@ -274,7 +274,8 @@ class qtype_ddimageortext extends qtype_ddtoimage_base {
}
$format->import_combined_feedback($question, $data, true);
$format->import_hints($question, $data, true);
$format->import_hints($question, $data, true, false,
$format->get_format($question->questiontextformat));
return $question;
}
+1 -1
View File
@@ -77,7 +77,7 @@ class qtype_ddtoimage_renderer_base extends qtype_with_combined_feedback_rendere
'draghome',
"dragitemhomes{$dragimage->no}",
"choice{$choiceno}");
if ($dragimage->isinfinite) {
if ($dragimage->infinite) {
$classes[] = 'infinite';
}
if ($dragimageurl === null) {