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

diff --git a/mod/forum/forum.js b/mod/forum/forum.js
index c18807fca2119b4870d390bc99381cddc20a32d5..1eb1ac992a48b9aec930d6dd519a4eca0442dfa3 100644 (file)
--- a/mod/forum/forum.js
+++ b/mod/forum/forum.js
@@ -15,4 +15,12 @@ function forum_produce_tracking_link(forumid, ltext, ltitle) {
     if(subs_link){
         subs_link.innerHTML = "<a title="+ltitle+" href='"+moodle_cfg.wwwroot+"/mod/forum/settracking.php?id="+forumid+"'>"+ltext+"<\/a>";
     }
-}
\ No newline at end of file
+}
+
+function lockoptions_timetoitems() {
+    lockoptions('searchform','timefromrestrict', timefromitems);
+}
+
+function lockoptions_timefromitems() {
+    lockoptions('searchform','timetorestrict', timetoitems);
+}

diff --git a/mod/forum/search.php b/mod/forum/search.php
index d59212a60540b2c6ae3ffb324c539c344d738e3e..9d8eb616a2edd9a63b6562b9513b9d5191a79a96 100644 (file)
--- a/mod/forum/search.php
+++ b/mod/forum/search.php
@@ -351,10 +351,8 @@ function forum_print_big_search_form($course) {
     echo '</table>';
     echo '</form>';
 
-    echo "<script type=\"text/javascript\">";
-    echo "lockoptions('searchform','timefromrestrict', timefromitems);";
-    echo "lockoptions('searchform','timetorestrict', timetoitems);";
-    echo "</script>\n";
+    echo $PAGE->requires->js_function_call('lockoptions_timetoitems')->asap();
+    echo $PAGE->requires->js_function_call('lockoptions_timefromitems')->asap();
 
     print_simple_box_end();
 }