From 6c772bcbf2f66fe101ddfb09ce5f7fad9b38aca5 Mon Sep 17 00:00:00 2001
From: Petr Skoda <skodak@moodle.org>
Date: Tue, 26 Jan 2010 09:36:00 +0000
Subject: [PATCH] MDL-21403 hardcoded JS legacy code should not use new
 $PAGE->requires-> api, switching to html_writer instead

---
 mod/quiz/accessrules.php                   | 4 ++--
 mod/quiz/report/grading/report.php         | 4 ++--
 mod/scorm/player.php                       | 6 +++---
 question/type/multianswer/questiontype.php | 5 +++--
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/mod/quiz/accessrules.php b/mod/quiz/accessrules.php
index 2e8e408d6bd..ea089d0cbff 100644
--- a/mod/quiz/accessrules.php
+++ b/mod/quiz/accessrules.php
@@ -727,8 +727,8 @@ class securewindow_access_rule extends quiz_access_rule_base {
         echo "window.open('$attempturl', '$window', '$this->windowoptions');", '" />';
 
     /// JavaScript to reveal the button.
-        echo $PAGE->requires->js('/mod/quiz/quiz.js')->asap();
-        echo $PAGE->requires->js_function_call('reveal_start_button')->asap();
+        echo html_writer::script('', $CFG->wwwroot.'/mod/quiz/quiz.js');
+        echo html_writer::script(js_writer::function_call('reveal_start_button'));
 
     /// A noscript tag to explains that this quiz only works with JavaScript enabled.
         echo '<noscript>';
diff --git a/mod/quiz/report/grading/report.php b/mod/quiz/report/grading/report.php
index 7b4f11cfc7c..4e8db69bef7 100644
--- a/mod/quiz/report/grading/report.php
+++ b/mod/quiz/report/grading/report.php
@@ -56,8 +56,8 @@ class quiz_grading_report extends quiz_default_report {
 
         $this->cm = $cm;
 
-        echo $PAGE->requires->js('/lib/overlib/overlib.js')->asap();
-        echo $PAGE->requires->js('/lib/overlib/overlib_cssstyle.js')->asap();
+        echo html_writer::script('', $CFG->wwwroot.'/lib/overlib/overlib.js');
+        echo html_writer::script('', $CFG->wwwroot.'/lib/overlib/overlib_cssstyle.js');
 
         $this->print_header_and_tabs($cm, $course, $quiz, $reportmode="grading");
 
diff --git a/mod/scorm/player.php b/mod/scorm/player.php
index 6eae24dd170..30aa1fd9783 100755
--- a/mod/scorm/player.php
+++ b/mod/scorm/player.php
@@ -312,9 +312,9 @@
             }
             $name = 'scorm_'.$name;
 
-            echo $PAGE->requires->js_function_call('scorm_resize')->asap();
-            echo $PAGE->requires->js('/mod/scorm/player.js')->asap();
-            echo $PAGE->requires->js_function_call('scorm_openpopup', Array("loadSCO.php?id=".$cm->id.$scoidpop, p($name), p($scorm->options), p($scorm->width), p($scorm->height)))->asap();
+            echo html_writer::script(js_writer::function_call('scorm_resize'));
+            echo html_writer::script('', $CFG->wwwroot.'/mod/scorm/player.js');
+            echo html_writer::script(js_writer::function_call('scorm_openpopup', Array("loadSCO.php?id=".$cm->id.$scoidpop, $name, $scorm->options, $scorm->width, $scorm->height)));
             ?>
                     <noscript>
                     <iframe id="main" class="scoframe" src="loadSCO.php?id=<?php echo $cm->id.$scoidstr.$modestr ?>">
diff --git a/question/type/multianswer/questiontype.php b/question/type/multianswer/questiontype.php
index 28e612a222a..0daa0323c7c 100644
--- a/question/type/multianswer/questiontype.php
+++ b/question/type/multianswer/questiontype.php
@@ -307,8 +307,9 @@ class embedded_cloze_qtype extends default_questiontype {
         // The regex will recognize text snippets of type {#X}
         // where the X can be any text not containg } or white-space characters.
 
-        echo $PAGE->requires->js('/lib/overlib/overlib.js')->asap();
-        echo $PAGE->requires->js('/lib/overlib/overlib_cssstyle.js')->asap();
+        // TODO: stop using overlib, use YUI instead
+        echo html_writer::script('', $CFG->wwwroot.'/lib/overlib/overlib.js');
+        echo html_writer::script('', $CFG->wwwroot.'/lib/overlib/overlib_cssstyle.js');
 
         while (preg_match('~\{#([^[:space:]}]*)}~', $qtextremaining, $regs)) {
             $qtextsplits = explode($regs[0], $qtextremaining, 2);