MDL-47712 qtype_multianswer: Move mathjaxloader spans to outer question

robjoyce · Mar 14, 2015 · 530a2cb · 530a2cb
1 parent 06122e4
commit 530a2cb
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/question/type/multianswer/renderer.php b/question/type/multianswer/renderer.php
@@ -45,15 +45,21 @@ public function formulation_and_controls(question_attempt $qa,
         $question = $qa->get_question();
 
         $output = '';
+        $subquestions = array();
         foreach ($question->textfragments as $i => $fragment) {
             if ($i > 0) {
                 $index = $question->places[$i];
-                $output .= $this->subquestion($qa, $options, $index,
+                $token = 'qtypemultianswer' . $i . 'marker';
+                $token = '<span class="nolink">' + $token + '</span>';
+                $output .= $token;
+                $subquestions[$token] = $this->subquestion($qa, $options, $index,
                         $question->subquestions[$index]);
             }
-            $output .= $question->format_text($fragment, $question->questiontextformat,
-                    $qa, 'question', 'questiontext', $question->id);
+            $output .= $fragment;
         }
+        $output = $question->format_text($output, $question->questiontextformat,
+                $qa, 'question', 'questiontext', $question->id);
+        $output = str_replace(array_keys($subquestions), array_values($subquestions), $output);
 
         if ($qa->get_state() == question_state::$invalid) {
             $output .= html_writer::nonempty_tag('div',