From ac324e05ea3c44e77810249a5ac67b95610c19f7 Mon Sep 17 00:00:00 2001 From: tjhunt Date: Thu, 25 Sep 2008 06:40:52 +0000 Subject: [PATCH] MDL-16675 change callers to require_js to take advantage of the fact that callers no longer have to add $CFG->wwwroot themselves. --- admin/report/capability/index.php | 2 +- blocks/admin_tree/block_admin_tree.php | 2 +- calendar/lib.php | 2 +- course/view.php | 4 ++-- grade/report/grader/index.php | 2 +- group/index.php | 7 ++----- lib/questionlib.php | 2 +- mod/quiz/attempt.php | 2 +- mod/quiz/review.php | 2 +- mod/quiz/summary.php | 2 +- mod/quiz/view.php | 3 +-- portfolio/type/download/file.php | 5 +---- tag/coursetagslib.php | 2 +- 13 files changed, 15 insertions(+), 22 deletions(-) diff --git a/admin/report/capability/index.php b/admin/report/capability/index.php index 8cb7ff0af8..b1c63e0aa1 100644 --- a/admin/report/capability/index.php +++ b/admin/report/capability/index.php @@ -39,7 +39,7 @@ if (empty($cleanedroleids)) { // Include the required JavaScript. require_js(array('yui_yahoo','yui_event')); -require_js($CFG->wwwroot . '/admin/report/capability/script.js'); +require_js('admin/report/capability/script.js'); // Log. add_to_log(SITEID, "admin", "report capability", "report/capability/index.php?capability=$capability", $capability); diff --git a/blocks/admin_tree/block_admin_tree.php b/blocks/admin_tree/block_admin_tree.php index d7ac10ecf4..d34900caae 100644 --- a/blocks/admin_tree/block_admin_tree.php +++ b/blocks/admin_tree/block_admin_tree.php @@ -134,7 +134,7 @@ class block_admin_tree extends block_base { if ($this->tempcontent !== '') { require_js(array('yui_yahoo','yui_event')); - require_js($CFG->wwwroot . '/blocks/admin_tree/admintree.js'); + require_js('blocks/admin_tree/admintree.js'); $this->content = new object(); $this->content->text = '
' . $this->tempcontent . "
\n"; $this->content->text .= print_js_call('admin_tree.init', diff --git a/calendar/lib.php b/calendar/lib.php index b9ddbb1787..5f49117b12 100644 --- a/calendar/lib.php +++ b/calendar/lib.php @@ -1197,7 +1197,7 @@ function calendar_session_vars($course=null) { } function calendar_overlib_html() { - require_js(CALENDAR_URL . 'overlib.cfg.php'); + require_js('calendar/overlib.cfg.php'); return ''; } diff --git a/course/view.php b/course/view.php index ddf087c6aa..49eebbc5d2 100644 --- a/course/view.php +++ b/course/view.php @@ -200,7 +200,7 @@ require_js(array('yui_yahoo','yui_event','yui_connection','yui_dom')); // Need to do this after the header because it requires the YUI stuff // to be loaded already - require_js($CFG->wwwroot . '/course/completion.js'); + require_js('course/completion.js'); print_js_config(array( 'completion_strsaved' => get_string('saved','completion'), 'completion_strtitley' => get_string('completion-title-manual-y','completion'), @@ -248,7 +248,7 @@ // At the bottom because we want to process sections and activities // after the relevant html has been generated. We're forced to do this // because of the way in which lib/ajax/ajaxcourse.js is written. - require_js($CFG->wwwroot . '/lib/ajax/ajaxcourse.js'); + require_js('lib/ajax/ajaxcourse.js'); $COURSE->javascriptportal->print_javascript($course->id); } diff --git a/grade/report/grader/index.php b/grade/report/grader/index.php index af96fae079..7c2aa7803a 100644 --- a/grade/report/grader/index.php +++ b/grade/report/grader/index.php @@ -191,7 +191,7 @@ if (!empty($studentsperpage)) { print_paging_bar($numusers, $report->page, $studentsperpage, $report->pbarurl); } -require_js('functions.js'); +require_js('grade/report/grader/functions.js'); $reporthtml = '
' . "\n"; $reporthtml .= ''; diff --git a/group/index.php b/group/index.php index fea5d78111..62b66f528d 100644 --- a/group/index.php +++ b/group/index.php @@ -12,11 +12,8 @@ require_once('../config.php'); require_once('lib.php'); require_once($CFG->libdir.'/json/JSON.php'); -require_js('yui_yahoo'); -require_js('yui_dom'); -require_js('yui_utilities'); -require_js('yui_connection'); -require_js($CFG->wwwroot.'/group/clientlib.js'); +require_js(array('yui_yahoo', 'yui_dom', 'yui_utilities', 'yui_connection')); +require_js('group/clientlib.js'); $courseid = required_param('id', PARAM_INT); $groupid = optional_param('group', false, PARAM_INT); diff --git a/lib/questionlib.php b/lib/questionlib.php index 88e5d34701..042d64117e 100644 --- a/lib/questionlib.php +++ b/lib/questionlib.php @@ -1963,7 +1963,7 @@ function get_html_head_contributions($questionlist, &$questions, &$states) { // The question engine's own JavaScript. require_js(array('yui_yahoo','yui_event', 'yui_connection')); - require_js($CFG->wwwroot . '/question/qengine.js'); + require_js('question/qengine.js'); // An inline script to record various lang strings, etc. that qengine.js needs. $contributions = array(question_init_qenginejs_script()); diff --git a/mod/quiz/attempt.php b/mod/quiz/attempt.php index c6cdc2c369..efb7dd14e7 100644 --- a/mod/quiz/attempt.php +++ b/mod/quiz/attempt.php @@ -81,7 +81,7 @@ // Print the page header require_js(array('yui_yahoo','yui_event')); - require_js($CFG->wwwroot . '/mod/quiz/quiz.js'); + require_js('mod/quiz/quiz.js'); $title = get_string('attempt', 'quiz', $attemptobj->get_attempt_number()); $headtags = $attemptobj->get_html_head_contributions($page); if ($accessmanager->securewindow_required($attemptobj->is_preview_user())) { diff --git a/mod/quiz/review.php b/mod/quiz/review.php index 2d9a03ebd0..f481b6f1af 100644 --- a/mod/quiz/review.php +++ b/mod/quiz/review.php @@ -70,7 +70,7 @@ } /// Print the page header - require_js($CFG->wwwroot . '/mod/quiz/quiz.js'); + require_js('mod/quiz/quiz.js'); $headtags = $attemptobj->get_html_head_contributions($page); if ($accessmanager->securewindow_required($attemptobj->is_preview_user())) { $accessmanager->setup_secure_page($course->shortname.': '.format_string($quiz->name), $headtags); diff --git a/mod/quiz/summary.php b/mod/quiz/summary.php index eb3fe54f45..0c30313ef6 100644 --- a/mod/quiz/summary.php +++ b/mod/quiz/summary.php @@ -44,7 +44,7 @@ $attemptobj->load_questions(); $attemptobj->load_question_states(); /// Print the page header -require_js($CFG->wwwroot . '/mod/quiz/quiz.js'); +require_js('mod/quiz/quiz.js'); $title = get_string('summaryofattempt', 'quiz'); if ($accessmanager->securewindow_required($attemptobj->is_preview_user())) { $accessmanager->setup_secure_page($attemptobj->get_course()->shortname . ': ' . diff --git a/mod/quiz/view.php b/mod/quiz/view.php index 2d335db0b0..a8ae9e904f 100644 --- a/mod/quiz/view.php +++ b/mod/quiz/view.php @@ -70,8 +70,7 @@ if ($accessmanager->securewindow_required($canpreview)) { $bodytags = 'onload="popupchecker(\'' . get_string('popupblockerwarning', 'quiz') . '\');"'; } - require_js('yui_yahoo'); - require_js('yui_event'); + require_js(array('yui_yahoo', 'yui_event')); $PAGE->print_header($course->shortname.': %fullname%','',$bodytags); /// Print any blocks on the left of the page. diff --git a/portfolio/type/download/file.php b/portfolio/type/download/file.php index b734b43e5a..d5b05789a5 100644 --- a/portfolio/type/download/file.php +++ b/portfolio/type/download/file.php @@ -2,10 +2,7 @@ require_once(dirname(dirname(dirname(dirname(__FILE__)))) . '/config.php'); require_once($CFG->libdir . '/portfoliolib.php'); -require_js(array( - 'yui_yahoo', - 'yui_dom', -)); +require_js(array('yui_yahoo', 'yui_dom')); $id = required_param('id', PARAM_INT); $exporter = portfolio_exporter::rewaken_object($id); diff --git a/tag/coursetagslib.php b/tag/coursetagslib.php index df7c3dd122..2bc0a7d91d 100644 --- a/tag/coursetagslib.php +++ b/tag/coursetagslib.php @@ -291,7 +291,7 @@ EOT; //]]> '; - require_js($CFG->wwwroot . '/blocks/tags/coursetags.js'); + require_js('blocks/tags/coursetags.js'); return $str; } -- 2.39.5