mod-resource MDL-16706 Removed inline JS and replaced with new PAGE methods

diff --git a/mod/resource/type/html/resource.class.php b/mod/resource/type/html/resource.class.php
index cadf8dfca8c660ea57e18db7a830879c97e452d6..76c6705c481008ccc7fed7241b430ac8bf6faa27 100644 (file)
--- a/mod/resource/type/html/resource.class.php
+++ b/mod/resource/type/html/resource.class.php
@@ -45,7 +45,7 @@ function _postprocess(&$resource) {
 
 
 function display() {
-    global $CFG;
+    global $CFG, $PAGE;
 
     $formatoptions = new object();
     $formatoptions->noclean = true;
@@ -96,11 +96,7 @@ function display() {
                         "", "", true, update_module_button($cm->id, $course->id, $this->strresource),
                         navmenu($course, $cm));
 
-                echo "\n<script type=\"text/javascript\">";
-                echo "\n//<![CDATA[\n";
-                echo "openpopup('/mod/resource/view.php?inpopup=true&id={$cm->id}','resource{$resource->id}','{$resource->popup}');\n";
-                echo "\n//]]>\n";
-                echo '</script>';
+                $PAGE->requires->js_function_call('openpopup', Array("/mod/resource/view.php?inpopup=true&id={$cm->id}","resource{$resource->id}",$resource->popup));
 
                 if (trim(strip_tags($resource->intro))) {
                     print_simple_box(format_module_intro('resource', $resource, $cm->id), "center");

diff --git a/mod/resource/type/text/resource.class.php b/mod/resource/type/text/resource.class.php
index 1cad6758e239d77cc2e25045b66d7aac9f5f8691..bfd6a8e88d29d051c67a37031437a97026203095 100644 (file)
--- a/mod/resource/type/text/resource.class.php
+++ b/mod/resource/type/text/resource.class.php
@@ -44,7 +44,7 @@ function _postprocess(&$resource) {
 }
 
 function display() {
-    global $CFG;
+    global $CFG, $PAGE;
 
     $formatoptions = new object();
     $formatoptions->noclean = true;
@@ -94,11 +94,7 @@ function display() {
                         "", "", true, update_module_button($cm->id, $course->id, $this->strresource),
                         navmenu($course, $cm));
 
-                echo "\n<script type=\"text/javascript\">";
-                echo "\n//<![CDATA[\n";
-                echo "openpopup('/mod/resource/view.php?inpopup=true&id={$cm->id}','resource{$resource->id}','{$resource->popup}');\n";
-                echo "\n//]]>\n";
-                echo '</script>';
+                $PAGE->requires->js_function_call('openpopup', Array("/mod/resource/view.php?inpopup=true&id={$cm->id}","resource{$resource->id}",$resource->popup));
 
                 if (trim(strip_tags($resource->intro))) {
                     print_simple_box(format_module_intro('resource', $resource, $cm->id), "center");