From f44b10ed932a53edbef58fe6af06a9de72e1ab30 Mon Sep 17 00:00:00 2001 From: Petr Skoda Date: Wed, 16 Dec 2009 20:25:14 +0000 Subject: [PATCH] MDL-21139 replace all yui functions/methods with yui2 to make room for yui3 --- admin/report/capability/index.php | 2 +- admin/report/security/lib.php | 2 +- admin/report/spamcleaner/index.php | 4 +-- admin/roles/assign.php | 2 +- admin/roles/lib.php | 2 +- blocks/admin_tree/block_admin_tree.php | 2 +- .../block_global_navigation_tree.php | 2 +- .../block_settings_navigation_tree.php | 2 +- calendar/event.php | 2 +- calendar/lib.php | 2 +- calendar/view.php | 2 +- comment/index.php | 12 ++++---- course/report/progress/index.php | 2 +- course/view.php | 8 ++--- grade/edit/tree/index.php | 14 ++++----- grade/report/grader/index.php | 12 ++++---- group/index.php | 2 +- iplookup/index.php | 2 +- lib/ajax/ajaxlib.php | 30 +++++++++---------- lib/commentlib.php | 12 ++++---- lib/deprecatedlib.php | 8 ++--- lib/form/filemanager.php | 6 ++-- lib/form/searchableselector.php | 2 +- lib/formslib.php | 6 ++-- lib/moodlelib.php | 2 +- lib/outputrenderers.php | 10 +++---- lib/questionlib.php | 2 +- lib/resourcelib.php | 4 +-- lib/weblib.php | 4 +-- mod/chat/gui_ajax/index.php | 18 +++++------ mod/folder/view.php | 4 +-- mod/forum/discuss.php | 6 ++-- mod/forum/view.php | 6 ++-- mod/imscp/view.php | 16 +++++----- mod/lesson/lib.php | 2 +- mod/quiz/attemptlib.php | 4 +-- mod/quiz/edit.php | 4 +-- mod/quiz/mod_form.php | 2 +- mod/quiz/view.php | 2 +- mod/resource/locallib.php | 2 +- mod/url/locallib.php | 2 +- mod/wiki/view.php | 2 +- portfolio/download/file.php | 2 +- question/editlib.php | 6 ++-- repository/lib.php | 26 ++++++++-------- tag/edit.php | 4 +-- theme/lines/meta.php | 2 +- user/selector/lib.php | 6 ++-- 48 files changed, 139 insertions(+), 139 deletions(-) diff --git a/admin/report/capability/index.php b/admin/report/capability/index.php index a23769122d..41220d2ca2 100644 --- a/admin/report/capability/index.php +++ b/admin/report/capability/index.php @@ -38,7 +38,7 @@ if (empty($cleanedroleids)) { } // Include the required JavaScript. -$PAGE->requires->yui_lib('event'); +$PAGE->requires->yui2_lib('event'); $PAGE->requires->js('admin/report/capability/script.js'); $PAGE->requires->js_function_call('capability_report.cap_filter_init', array(get_string('search'))); diff --git a/admin/report/security/lib.php b/admin/report/security/lib.php index 042933f1e7..e17ee8aa5e 100644 --- a/admin/report/security/lib.php +++ b/admin/report/security/lib.php @@ -34,7 +34,7 @@ define('REPORT_SECURITY_CRITICAL', 'critical'); function report_security_hide_timearning() { global $PAGE; - $PAGE->requires->yui_lib('dom'); + $PAGE->requires->yui2_lib('dom'); $PAGE->requires->js_function_call('YAHOO.util.Dom.addClass', Array('timewarning', 'timewarninghidden')); } diff --git a/admin/report/spamcleaner/index.php b/admin/report/spamcleaner/index.php index 478a56d139..88278c21d0 100755 --- a/admin/report/spamcleaner/index.php +++ b/admin/report/spamcleaner/index.php @@ -41,8 +41,8 @@ $id = optional_param('id', '', PARAM_INT); require_login(); admin_externalpage_setup('reportspamcleaner'); -$PAGE->requires->yui_lib('json'); -$PAGE->requires->yui_lib('connection'); +$PAGE->requires->yui2_lib('json'); +$PAGE->requires->yui2_lib('connection'); // Implement some AJAX calls diff --git a/admin/roles/assign.php b/admin/roles/assign.php index 744cee1860..a5e48501c8 100755 --- a/admin/roles/assign.php +++ b/admin/roles/assign.php @@ -256,7 +256,7 @@ } /// Print the header and tabs - $PAGE->requires->yui_lib('dom-event'); + $PAGE->requires->yui2_lib('dom-event'); $PAGE->requires->js($CFG->admin . '/roles/roles.js'); if ($context->contextlevel == CONTEXT_USER) { $user = $DB->get_record('user', array('id'=>$userid)); diff --git a/admin/roles/lib.php b/admin/roles/lib.php index 226e08e517..76fd7af06d 100644 --- a/admin/roles/lib.php +++ b/admin/roles/lib.php @@ -122,7 +122,7 @@ abstract class capability_table_base { echo "\n\n"; if (count($this->capabilities) > capability_table_base::NUM_CAPS_FOR_SEARCH) { global $CFG, $PAGE; - $PAGE->requires->yui_lib('dom-event'); + $PAGE->requires->yui2_lib('dom-event'); $PAGE->requires->js($CFG->admin . '/roles/roles.js'); $PAGE->requires->js_function_call('cap_table_filter.init', array($this->id, get_string('filter'), get_string('clear'))); diff --git a/blocks/admin_tree/block_admin_tree.php b/blocks/admin_tree/block_admin_tree.php index be6f3fc211..a0d9ed7333 100644 --- a/blocks/admin_tree/block_admin_tree.php +++ b/blocks/admin_tree/block_admin_tree.php @@ -137,7 +137,7 @@ class block_admin_tree extends block_base { } if ($this->tempcontent !== '') { - $this->page->requires->yui_lib('event'); + $this->page->requires->yui2_lib('event'); $this->page->requires->js('blocks/admin_tree/admintree.js'); $this->page->requires->js_function_call('admin_tree.init', array($this->divcounter - 1, $this->expandnodes, diff --git a/blocks/global_navigation_tree/block_global_navigation_tree.php b/blocks/global_navigation_tree/block_global_navigation_tree.php index 9586b8e1cd..175d9bc298 100644 --- a/blocks/global_navigation_tree/block_global_navigation_tree.php +++ b/blocks/global_navigation_tree/block_global_navigation_tree.php @@ -88,7 +88,7 @@ class block_global_navigation_tree extends block_tree { if ($this->contentgenerated === true) { return true; } - $this->page->requires->yui_lib('dom'); + $this->page->requires->yui2_lib('dom'); $this->page->requires->js('lib/javascript-navigation.js'); // Navcount is used to allow us to have multiple trees although I dont' know why // you would want to trees the same diff --git a/blocks/settings_navigation_tree/block_settings_navigation_tree.php b/blocks/settings_navigation_tree/block_settings_navigation_tree.php index 881f54ed49..6ceb6e9dac 100644 --- a/blocks/settings_navigation_tree/block_settings_navigation_tree.php +++ b/blocks/settings_navigation_tree/block_settings_navigation_tree.php @@ -87,7 +87,7 @@ class block_settings_navigation_tree extends block_tree { if ($this->contentgenerated === true) { return true; } - $this->page->requires->yui_lib('dom'); + $this->page->requires->yui2_lib('dom'); $this->page->requires->js('lib/javascript-navigation.js'); block_settings_navigation_tree::$navcount++; diff --git a/calendar/event.php b/calendar/event.php index 7c2fda74af..405a95951c 100644 --- a/calendar/event.php +++ b/calendar/event.php @@ -200,7 +200,7 @@ if ($data) { redirect($eventurl); } -$PAGE->requires->yui_lib('animation'); +$PAGE->requires->yui2_lib('animation'); $PAGE->requires->js('calendar/calendar.js'); $PAGE->navbar->add($strcalendar, $link); diff --git a/calendar/lib.php b/calendar/lib.php index e40a87b58a..118e19056a 100644 --- a/calendar/lib.php +++ b/calendar/lib.php @@ -379,7 +379,7 @@ function calendar_get_popup($is_today, $event_timestart, $popupcontent='') { $popupcaption .= get_string('eventsfor', 'calendar', userdate($event_timestart, get_string('strftimedayshort'))); } $id = 'calendar_tooltip_'.$popupcount; - $PAGE->requires->yui_lib('container'); + $PAGE->requires->yui2_lib('container'); $PAGE->requires->js_function_call('YAHOO.moodle.calendar.attach_calendar_panel', Array(Array('id'=>$id,'title'=>$popupcaption, 'content'=>$popupcontent))); $popupcount++; return 'id="'.$id.'"'; diff --git a/calendar/view.php b/calendar/view.php index 8b4cbc617d..18ed3b547e 100644 --- a/calendar/view.php +++ b/calendar/view.php @@ -155,7 +155,7 @@ $PAGE->set_heading($strcalendar); $PAGE->set_headingmenu(user_login_string($site)); $PAGE->set_button($prefsbutton); -$PAGE->requires->yui_lib('animation'); +$PAGE->requires->yui2_lib('animation'); $PAGE->requires->js('calendar/calendar.js'); echo $OUTPUT->header(); diff --git a/comment/index.php b/comment/index.php index fcf4e8622d..9b7f2f6189 100644 --- a/comment/index.php +++ b/comment/index.php @@ -28,12 +28,12 @@ admin_externalpage_setup('comments'); $context = get_context_instance(CONTEXT_SYSTEM); require_capability('moodle/comment:delete', $context); -$PAGE->requires->yui_lib('yahoo')->in_head(); -$PAGE->requires->yui_lib('dom')->in_head(); -$PAGE->requires->yui_lib('event')->in_head(); -$PAGE->requires->yui_lib('animation')->in_head(); -$PAGE->requires->yui_lib('json')->in_head(); -$PAGE->requires->yui_lib('connection')->in_head(); +$PAGE->requires->yui2_lib('yahoo')->in_head(); +$PAGE->requires->yui2_lib('dom')->in_head(); +$PAGE->requires->yui2_lib('event')->in_head(); +$PAGE->requires->yui2_lib('animation')->in_head(); +$PAGE->requires->yui2_lib('json')->in_head(); +$PAGE->requires->yui2_lib('connection')->in_head(); $PAGE->requires->js('comment/admin.js')->in_head(); $action = optional_param('action', '', PARAM_ALPHA); diff --git a/course/report/progress/index.php b/course/report/progress/index.php index 8c9bc94292..0dde0538e7 100644 --- a/course/report/progress/index.php +++ b/course/report/progress/index.php @@ -104,7 +104,7 @@ if($csv) { echo $OUTPUT->header(); if($svgcleverness) { - $PAGE->requires->yui_lib('event'); + $PAGE->requires->yui2_lib('event'); $PAGE->requires->js('course/report/progress/textrotate.js'); } diff --git a/course/view.php b/course/view.php index 6bae6db916..2e3a1ad0c6 100644 --- a/course/view.php +++ b/course/view.php @@ -158,9 +158,9 @@ // Course-based switches if (ajaxenabled($CFG->ajaxtestedbrowsers)) { // Browser, user and site-based switches - $PAGE->requires->yui_lib('dragdrop')->asap(); - $PAGE->requires->yui_lib('connection')->asap(); - $PAGE->requires->yui_lib('selector')->asap(); + $PAGE->requires->yui2_lib('dragdrop')->asap(); + $PAGE->requires->yui2_lib('connection')->asap(); + $PAGE->requires->yui2_lib('selector')->asap(); $PAGE->requires->js('lib/ajax/block_classes.js')->asap(); $PAGE->requires->js('lib/ajax/section_classes.js')->asap(); @@ -178,7 +178,7 @@ $completion = new completion_info($course); if ($completion->is_enabled() && ajaxenabled()) { - $PAGE->requires->yui_lib('connection')->asap(); + $PAGE->requires->yui2_lib('connection')->asap(); $PAGE->requires->js('course/completion.js')->asap(); $PAGE->requires->js_function_call('completion_init')->on_dom_ready(); $PAGE->requires->data_for_js('completion_strsaved', get_string('saved', 'completion')); diff --git a/grade/edit/tree/index.php b/grade/edit/tree/index.php index b85059638a..90b6701ccc 100644 --- a/grade/edit/tree/index.php +++ b/grade/edit/tree/index.php @@ -28,13 +28,13 @@ require_once $CFG->dirroot.'/grade/lib.php'; require_once $CFG->dirroot.'/grade/report/lib.php'; // for preferences require_once $CFG->dirroot.'/grade/edit/tree/lib.php'; -$PAGE->requires->yui_lib('event'); -$PAGE->requires->yui_lib('json'); -$PAGE->requires->yui_lib('connection'); -$PAGE->requires->yui_lib('dragdrop'); -$PAGE->requires->yui_lib('element'); -$PAGE->requires->yui_lib('container'); -$PAGE->requires->yui_lib('animation'); +$PAGE->requires->yui2_lib('event'); +$PAGE->requires->yui2_lib('json'); +$PAGE->requires->yui2_lib('connection'); +$PAGE->requires->yui2_lib('dragdrop'); +$PAGE->requires->yui2_lib('element'); +$PAGE->requires->yui2_lib('container'); +$PAGE->requires->yui2_lib('animation'); $PAGE->requires->js('grade/edit/tree/functions.js'); $courseid = required_param('id', PARAM_INT); diff --git a/grade/report/grader/index.php b/grade/report/grader/index.php index 3a4213e6a7..b5225f4f88 100644 --- a/grade/report/grader/index.php +++ b/grade/report/grader/index.php @@ -110,12 +110,12 @@ $reportname = get_string('modulename', 'gradereport_grader'); // Initialise the grader report object $report = new grade_report_grader($courseid, $gpr, $context, $page, $sortitemid); -$PAGE->requires->yui_lib('event'); -$PAGE->requires->yui_lib('json'); -$PAGE->requires->yui_lib('connection'); -$PAGE->requires->yui_lib('dragdrop'); -$PAGE->requires->yui_lib('element'); -$PAGE->requires->yui_lib('container'); +$PAGE->requires->yui2_lib('event'); +$PAGE->requires->yui2_lib('json'); +$PAGE->requires->yui2_lib('connection'); +$PAGE->requires->yui2_lib('dragdrop'); +$PAGE->requires->yui2_lib('element'); +$PAGE->requires->yui2_lib('container'); $PAGE->requires->js('grade/report/grader/functions.js'); $PAGE->requires->js('grade/report/grader/grader.js'); $PAGE->requires->js('lib/overlib/overlib.js')->in_head(); diff --git a/group/index.php b/group/index.php index 7c33cf8a6d..4f76f72ba1 100644 --- a/group/index.php +++ b/group/index.php @@ -13,7 +13,7 @@ require_once('lib.php'); ini_set('include_path', $CFG->libdir.'/pear'.PATH_SEPARATOR.ini_get('include_path')); -$PAGE->requires->yui_lib('connection'); +$PAGE->requires->yui2_lib('connection'); $PAGE->requires->js('group/clientlib.js'); $courseid = required_param('id', PARAM_INT); diff --git a/iplookup/index.php b/iplookup/index.php index 5db39aed51..57b5b75d54 100644 --- a/iplookup/index.php +++ b/iplookup/index.php @@ -155,7 +155,7 @@ if (empty($CFG->googlemapkey)) { $PAGE->requires->js("http://maps.google.com/maps?file=api&v=2&key=$CFG->googlemapkey", true)->in_head(); $PAGE->requires->js('/iplookup/functions.js')->in_head(); - $PAGE->requires->yui_lib('event'); + $PAGE->requires->yui2_lib('event'); $PAGE->requires->js_function_call('iplookup_load', array($latitude, $longitude)); $PAGE->set_title(get_string('iplookup', 'admin').': '.$info); diff --git a/lib/ajax/ajaxlib.php b/lib/ajax/ajaxlib.php index d6a0913e94..efd25a3d40 100644 --- a/lib/ajax/ajaxlib.php +++ b/lib/ajax/ajaxlib.php @@ -51,7 +51,7 @@ function setup_core_javascript(page_requirements_manager $requires) { $requires->data_for_js('moodle_cfg', $config)->in_head(); if (debugging('', DEBUG_DEVELOPER)) { - $requires->yui_lib('logger'); + $requires->yui2_lib('logger'); } $requires->skip_link_to('maincontent', get_string('tocontent', 'access')); @@ -59,8 +59,8 @@ function setup_core_javascript(page_requirements_manager $requires) { // Note that, as a short-cut, the code // $js = "document.body.className += ' jsenabled';\n"; // is hard-coded in {@link page_requirements_manager::get_top_of_body_code) - $requires->yui_lib('container'); - $requires->yui_lib('connection'); + $requires->yui2_lib('container'); + $requires->yui2_lib('connection'); $requires->string_for_js('confirmation', 'admin'); $requires->string_for_js('cancel', 'moodle'); $requires->string_for_js('yes', 'moodle'); @@ -154,14 +154,14 @@ class page_requirements_manager { * of other libraries) it will only be linked to once. * * @param $libname the name of the YUI library you require. For example 'autocomplete'. - * @return required_yui_lib A requried_yui_lib object. This allows you to control when the - * link to the script is output by calling methods like {@link required_yui_lib::asap()} or - * {@link required_yui_lib::in_head()}. + * @return required_yui2_lib A required_yui2_lib object. This allows you to control when the + * link to the script is output by calling methods like {@link required_yui2_lib::asap()} or + * {@link required_yui2_lib::in_head()}. */ - public function yui_lib($libname) { + public function yui2_lib($libname) { $key = 'yui:' . $libname; if (!isset($this->linkedrequirements[$key])) { - $this->linkedrequirements[$key] = new required_yui_lib($this, $libname); + $this->linkedrequirements[$key] = new required_yui2_lib($this, $libname); } return $this->linkedrequirements[$key]; } @@ -370,7 +370,7 @@ class page_requirements_manager { public function event_handler($id, $event, $function, $arguments=array()) { $requirement = new required_event_handler($this, $id, $event, $function, $arguments); $this->requiredjscode[] = $requirement; - $this->linkedrequirements[] = new required_yui_lib($this, 'event'); + $this->linkedrequirements[] = new required_yui2_lib($this, 'event'); return $requirement; } @@ -689,7 +689,7 @@ class required_js extends linked_requirement { * * The methods {@link asap()}, {@link in_head()} and {@link at_top_of_body()} * are indented to be used as a fluid API, so you can say things like - * $PAGE->requires->yui_lib('autocomplete')->in_head(); + * $PAGE->requires->yui2_lib('autocomplete')->in_head(); * * This class (with the help of {@link ajax_resolve_yui2_lib()}) knows about the * dependancies between the different YUI libraries, and will include all the @@ -704,13 +704,13 @@ class required_js extends linked_requirement { * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @since Moodle 2.0 */ -class required_yui_lib extends linked_requirement { +class required_yui2_lib extends linked_requirement { protected $jss = array(); /** * Constructor. Normally instances of this class should not be created * directly. Client code should create them via the page_requirements_manager - * method {@link page_requirements_manager::yui_lib()}. + * method {@link page_requirements_manager::yui2_lib()}. * * @param page_requirements_manager $manager the page_requirements_manager we are associated with. * @param string $libname The name of the YUI library you want. See the array @@ -739,7 +739,7 @@ class required_yui_lib extends linked_requirement { * is responsible for outputting this HTML promptly. For example, a good way to * call this method is like * 
-     *     echo $PAGE->requires->yui_lib(...)->asap();
+     *     echo $PAGE->requires->yui2_lib(...)->asap();
      *
*/ public function asap() { @@ -848,7 +848,7 @@ class required_skip_link extends linked_requirement { /** * Constructor. Normally instances of this class should not be created directly. * Client code should create them via the page_requirements_manager - * method {@link page_requirements_manager::yui_lib()}. + * method {@link page_requirements_manager::yui2_lib()}. * * @param page_requirements_manager $manager the page_requirements_manager we are associated with. * @param string $target the name of the anchor in the page we are linking to. @@ -1015,7 +1015,7 @@ class required_js_function_call extends required_js_code { if ($this->is_done() || $this->when < page_requirements_manager::WHEN_AT_END) { return; } - $this->manager->yui_lib('event'); + $this->manager->yui2_lib('event'); $this->when = page_requirements_manager::WHEN_ON_DOM_READY; } diff --git a/lib/commentlib.php b/lib/commentlib.php index 7aceb95889..deafc233b7 100644 --- a/lib/commentlib.php +++ b/lib/commentlib.php @@ -178,12 +178,12 @@ EOD; self::$comment_context = optional_param('comment_context', '', PARAM_INT); self::$comment_area = optional_param('comment_area', '', PARAM_ALPHAEXT); - $PAGE->requires->yui_lib('yahoo')->in_head(); - $PAGE->requires->yui_lib('dom')->in_head(); - $PAGE->requires->yui_lib('event')->in_head(); - $PAGE->requires->yui_lib('animation')->in_head(); - $PAGE->requires->yui_lib('json')->in_head(); - $PAGE->requires->yui_lib('connection')->in_head(); + $PAGE->requires->yui2_lib('yahoo')->in_head(); + $PAGE->requires->yui2_lib('dom')->in_head(); + $PAGE->requires->yui2_lib('event')->in_head(); + $PAGE->requires->yui2_lib('animation')->in_head(); + $PAGE->requires->yui2_lib('json')->in_head(); + $PAGE->requires->yui2_lib('connection')->in_head(); $PAGE->requires->js('comment/comment.js')->in_head(); $PAGE->requires->string_for_js('addcomment', 'moodle'); $PAGE->requires->string_for_js('deletecomment', 'moodle'); diff --git a/lib/deprecatedlib.php b/lib/deprecatedlib.php index 3be437d27a..b19f26f25b 100644 --- a/lib/deprecatedlib.php +++ b/lib/deprecatedlib.php @@ -1672,11 +1672,11 @@ function use_html_editor($name='', $editorhidebuttons='', $id='') { /** * The old method that was used to include JavaScript libraries. - * Please use $PAGE->requires->js() or $PAGE->requires->yui_lib() instead. + * Please use $PAGE->requires->js() or $PAGE->requires->yui2_lib() instead. * * @param mixed $lib The library or libraries to load (a string or array of strings) * There are three way to specify the library: - * 1. a shorname like 'yui_yahoo'. This translates into a call to $PAGE->requires->yui_lib('yahoo')->asap(); + * 1. a shorname like 'yui_yahoo'. This translates into a call to $PAGE->requires->yui2_lib('yahoo')->asap(); * 2. the path to the library relative to wwwroot, for example 'lib/javascript-static.js' * 3. (legacy) a full URL like $CFG->wwwroot . '/lib/javascript-static.js'. * 2. and 3. lead to a call $PAGE->requires->js('/lib/javascript-static.js'). @@ -1694,10 +1694,10 @@ function require_js($lib) { // TODO uncomment this once we have eliminated the remaining calls to require_js from core. //debugging('Call to deprecated function require_js. Please use $PAGE->requires->js() ' . - // 'or $PAGE->requires->yui_lib() instead.', DEBUG_DEVELOPER); + // 'or $PAGE->requires->yui2_lib() instead.', DEBUG_DEVELOPER); if (strpos($lib, 'yui_') === 0) { - echo $PAGE->requires->yui_lib(substr($lib, 4))->asap(); + echo $PAGE->requires->yui2_lib(substr($lib, 4))->asap(); } else if (preg_match('/^https?:/', $lib)) { echo $PAGE->requires->js(str_replace($CFG->wwwroot, '', $lib))->asap(); } else { diff --git a/lib/form/filemanager.php b/lib/form/filemanager.php index 9a8522f646..d56be509eb 100644 --- a/lib/form/filemanager.php +++ b/lib/form/filemanager.php @@ -37,9 +37,9 @@ class MoodleQuickForm_filemanager extends HTML_QuickForm_element { require_once("$CFG->dirroot/repository/lib.php"); // has to require these js files before head - $PAGE->requires->yui_lib('menu'); - $PAGE->requires->yui_lib('connection'); - $PAGE->requires->yui_lib('json'); + $PAGE->requires->yui2_lib('menu'); + $PAGE->requires->yui2_lib('connection'); + $PAGE->requires->yui2_lib('json'); $options = (array)$options; foreach ($options as $name=>$value) { diff --git a/lib/form/searchableselector.php b/lib/form/searchableselector.php index 8b8762c302..0d2d6eeeab 100644 --- a/lib/form/searchableselector.php +++ b/lib/form/searchableselector.php @@ -54,7 +54,7 @@ class MoodleQuickForm_searchableselector extends MoodleQuickForm_select{ } else { // Javascript for the search/selection fields global $PAGE; - $PAGE->requires->yui_lib('event'); + $PAGE->requires->yui2_lib('event'); $PAGE->requires->js('lib/form/searchableselector.js'); $PAGE->requires->js_function_call('selector.filter_init', array(get_string('search'),$this->getAttribute('id'))); diff --git a/lib/formslib.php b/lib/formslib.php index 5697154861..dfdb9bd47d 100644 --- a/lib/formslib.php +++ b/lib/formslib.php @@ -69,8 +69,8 @@ function form_init_date_js() { global $PAGE; static $done = false; if (!$done) { - $PAGE->requires->yui_lib('calendar'); - $PAGE->requires->yui_lib('container'); + $PAGE->requires->yui2_lib('calendar'); + $PAGE->requires->yui2_lib('container'); $PAGE->requires->js_function_call('init_date_selectors', array(get_string('firstdayofweek'))); $done = true; @@ -2158,7 +2158,7 @@ class MoodleQuickForm_Renderer extends HTML_QuickForm_Renderer_Tableless{ } if (isset($this->_advancedElements[$name])){ - $PAGE->requires->yui_lib('event'); + $PAGE->requires->yui2_lib('event'); // this is tricky - the first submit button on form is "clicked" if user presses enter // we do not want to "submit" using advanced button if javascript active $button_nojs = ''; diff --git a/lib/moodlelib.php b/lib/moodlelib.php index 44e7a3b77c..f1ef768993 100644 --- a/lib/moodlelib.php +++ b/lib/moodlelib.php @@ -1293,7 +1293,7 @@ function user_preference_allow_ajax_update($name, $paramtype) { global $USER, $PAGE; // Make sure that the required JavaScript libraries are loaded. - $PAGE->requires->yui_lib('connection'); + $PAGE->requires->yui2_lib('connection'); // Record in the session that this user_preference is allowed to updated remotely. $USER->ajax_updatable_user_prefs[$name] = $paramtype; diff --git a/lib/outputrenderers.php b/lib/outputrenderers.php index cf0c9b6d0d..3d751054b4 100644 --- a/lib/outputrenderers.php +++ b/lib/outputrenderers.php @@ -330,8 +330,8 @@ class core_renderer extends renderer_base { // Perform a browser environment check for the flash version. Should only run once per login session. if (isloggedin() && !empty($CFG->excludeoldflashclients) && empty($SESSION->flashversion)) { - $this->page->requires->yui_lib('event')->in_head(); - $this->page->requires->yui_lib('connection')->in_head(); + $this->page->requires->yui2_lib('event')->in_head(); + $this->page->requires->yui2_lib('connection')->in_head(); $this->page->requires->js('lib/swfobject/swfobject.js')->in_head(); $this->page->requires->js('lib/flashdetect/flashdetect.js')->in_head(); $this->page->requires->js_function_call('setflashversiontosession', array($CFG->wwwroot, sesskey())); @@ -688,8 +688,8 @@ class core_renderer extends renderer_base { if ($bc->collapsible != block_contents::NOT_HIDEABLE) { $userpref = 'block' . $bc->blockinstanceid . 'hidden'; user_preference_allow_ajax_update($userpref, PARAM_BOOL); - $this->page->requires->yui_lib('dom'); - $this->page->requires->yui_lib('event'); + $this->page->requires->yui2_lib('dom'); + $this->page->requires->yui2_lib('event'); $plaintitle = strip_tags($bc->title); $this->page->requires->js_function_call('new block_hider', array($bc->id, $userpref, get_string('hideblocka', 'access', $plaintitle), get_string('showblocka', 'access', $plaintitle), @@ -1905,7 +1905,7 @@ class core_renderer extends renderer_base { $output .= $this->output_end_tag('table') . "\n"; if ($table->rotateheaders && can_use_rotated_text()) { - $this->page->requires->yui_lib('event'); + $this->page->requires->yui2_lib('event'); $this->page->requires->js('course/report/progress/textrotate.js'); } diff --git a/lib/questionlib.php b/lib/questionlib.php index 60d3734b42..fdeaaab0b5 100644 --- a/lib/questionlib.php +++ b/lib/questionlib.php @@ -2127,7 +2127,7 @@ function get_html_head_contributions($questionlist, &$questions, &$states) { global $CFG, $PAGE, $QTYPES; // The question engine's own JavaScript. - $PAGE->requires->yui_lib('connection'); + $PAGE->requires->yui2_lib('connection'); $PAGE->requires->js('question/qengine.js'); question_init_qengine_js(); diff --git a/lib/resourcelib.php b/lib/resourcelib.php index 23e5d9fbfa..1b3d0d085c 100644 --- a/lib/resourcelib.php +++ b/lib/resourcelib.php @@ -172,7 +172,7 @@ function resourcelib_embed_mp3($fullurl, $title, $clicktoopen) { OET; - $PAGE->requires->yui_lib('dom')->in_head(); + $PAGE->requires->yui2_lib('dom')->in_head(); $PAGE->requires->js('lib/ufo.js')->in_head(); $PAGE->requires->js('lib/resourcelib.js')->in_head(); $code .= $PAGE->requires->data_for_js('FO', $ufoargs)->asap(); @@ -218,7 +218,7 @@ function resourcelib_embed_flashvideo($fullurl, $title, $clicktoopen) { EOT; - $PAGE->requires->yui_lib('dom')->in_head(); + $PAGE->requires->yui2_lib('dom')->in_head(); $PAGE->requires->js('lib/ufo.js')->in_head(); $PAGE->requires->js('lib/resourcelib.js')->in_head(); $code .= $PAGE->requires->data_for_js('FO', $ufoargs)->asap(); diff --git a/lib/weblib.php b/lib/weblib.php index 407b4b36fd..250a7268f5 100644 --- a/lib/weblib.php +++ b/lib/weblib.php @@ -1567,7 +1567,7 @@ function get_emoticons_list_for_help_file() { $fieldname = 'message'; } - $PAGE->requires->yui_lib('event'); + $PAGE->requires->yui2_lib('event'); $PAGE->requires->js_function_call('emoticons_help.init', array($formname, $fieldname, 'emoticonlist')); return $output; @@ -2048,7 +2048,7 @@ function print_collapsible_region_start($classes, $id, $caption, $userpref = fal global $CFG, $PAGE, $OUTPUT; // Include required JavaScript libraries. - $PAGE->requires->yui_lib('animation'); + $PAGE->requires->yui2_lib('animation'); // Work out the initial state. if (is_string($userpref)) { diff --git a/mod/chat/gui_ajax/index.php b/mod/chat/gui_ajax/index.php index eeca5f131a..ae792edcf0 100644 --- a/mod/chat/gui_ajax/index.php +++ b/mod/chat/gui_ajax/index.php @@ -58,14 +58,14 @@ $str_themes = get_string('themes'); $PAGE->set_pagelayout('popup'); $PAGE->set_title('Chat'); -$PAGE->requires->yui_lib('dragdrop'); -$PAGE->requires->yui_lib('resize'); -$PAGE->requires->yui_lib('layout'); -$PAGE->requires->yui_lib('container'); -$PAGE->requires->yui_lib('connection'); -$PAGE->requires->yui_lib('json'); -$PAGE->requires->yui_lib('animation'); -$PAGE->requires->yui_lib('menu'); +$PAGE->requires->yui2_lib('dragdrop'); +$PAGE->requires->yui2_lib('resize'); +$PAGE->requires->yui2_lib('layout'); +$PAGE->requires->yui2_lib('container'); +$PAGE->requires->yui2_lib('connection'); +$PAGE->requires->yui2_lib('json'); +$PAGE->requires->yui2_lib('animation'); +$PAGE->requires->yui2_lib('menu'); if (!file_exists(dirname(__FILE__) . '/theme/'.$theme.'/chat.css')) { $theme = 'bubble'; @@ -91,7 +91,7 @@ $PAGE->requires->string_for_js('beep', 'chat'); $PAGE->requires->string_for_js('talk', 'chat'); $PAGE->requires->js('mod/chat/gui_ajax/script.js'); -$PAGE->requires->yui_lib('animation')->in_head(); +$PAGE->requires->yui2_lib('animation')->in_head(); $PAGE->add_body_class('yui-skin-sam'); $PAGE->set_pagelayout('embedded'); diff --git a/mod/folder/view.php b/mod/folder/view.php index f91b7da96f..785981d53c 100644 --- a/mod/folder/view.php +++ b/mod/folder/view.php @@ -46,8 +46,8 @@ $context = get_context_instance(CONTEXT_MODULE, $cm->id); add_to_log($course->id, 'folder', 'view', 'view.php?id='.$cm->id, $folder->id, $cm->id); $PAGE->set_url('mod/folder/view.php', array('id' => $cm->id)); -$PAGE->requires->yui_lib('json'); -$PAGE->requires->yui_lib('treeview'); +$PAGE->requires->yui2_lib('json'); +$PAGE->requires->yui2_lib('treeview'); $PAGE->requires->js('mod/folder/functions.js'); $PAGE->set_title($course->shortname.': '.$folder->name); diff --git a/mod/forum/discuss.php b/mod/forum/discuss.php index 2671dff8b6..3be7593575 100644 --- a/mod/forum/discuss.php +++ b/mod/forum/discuss.php @@ -69,9 +69,9 @@ require_course_login($course, true, $cm); /// Add ajax-related libs - $PAGE->requires->yui_lib('event'); - $PAGE->requires->yui_lib('connection'); - $PAGE->requires->yui_lib('json'); + $PAGE->requires->yui2_lib('event'); + $PAGE->requires->yui2_lib('connection'); + $PAGE->requires->yui2_lib('json'); $PAGE->requires->js('mod/forum/rate_ajax.js'); // move this down fix for MDL-6926 diff --git a/mod/forum/view.php b/mod/forum/view.php index 4a569b7466..7daa7b4d80 100644 --- a/mod/forum/view.php +++ b/mod/forum/view.php @@ -94,9 +94,9 @@ /// Print header. /// Add ajax-related libs for ratings if required MDL-20119 - $PAGE->requires->yui_lib('event'); - $PAGE->requires->yui_lib('connection'); - $PAGE->requires->yui_lib('json'); + $PAGE->requires->yui2_lib('event'); + $PAGE->requires->yui2_lib('connection'); + $PAGE->requires->yui2_lib('json'); $PAGE->requires->js('mod/forum/rate_ajax.js'); $PAGE->set_title(format_string($forum->name)); diff --git a/mod/imscp/view.php b/mod/imscp/view.php index e8ad427e2b..92f57e7686 100644 --- a/mod/imscp/view.php +++ b/mod/imscp/view.php @@ -46,14 +46,14 @@ $context = get_context_instance(CONTEXT_MODULE, $cm->id); add_to_log($course->id, 'imscp', 'view', 'view.php?id='.$cm->id, $imscp->id, $cm->id); $PAGE->set_url('mod/imscp/view.php', array('id' => $cm->id)); -$PAGE->requires->yui_lib('json')->in_head(); -$PAGE->requires->yui_lib('event')->in_head(); -$PAGE->requires->yui_lib('treeview')->in_head(); -$PAGE->requires->yui_lib('layout')->in_head(); -$PAGE->requires->yui_lib('button')->in_head(); -$PAGE->requires->yui_lib('container')->in_head(); -$PAGE->requires->yui_lib('dragdrop')->in_head(); -$PAGE->requires->yui_lib('resize')->in_head(); +$PAGE->requires->yui2_lib('json')->in_head(); +$PAGE->requires->yui2_lib('event')->in_head(); +$PAGE->requires->yui2_lib('treeview')->in_head(); +$PAGE->requires->yui2_lib('layout')->in_head(); +$PAGE->requires->yui2_lib('button')->in_head(); +$PAGE->requires->yui2_lib('container')->in_head(); +$PAGE->requires->yui2_lib('dragdrop')->in_head(); +$PAGE->requires->yui2_lib('resize')->in_head(); $PAGE->requires->js('mod/imscp/functions.js')->in_head(); $PAGE->requires->string_for_js('navigation', 'imscp'); diff --git a/mod/lesson/lib.php b/mod/lesson/lib.php index 29320d6d45..3df506748b 100644 --- a/mod/lesson/lib.php +++ b/mod/lesson/lib.php @@ -1036,7 +1036,7 @@ function lesson_get_media_html($lesson, $context) { } else { // anything else - just try object tag enlarged as much as possible $code = resourcelib_embed_general($url, $title, $clicktoopen, $mimetype); - $PAGE->requires->yui_lib('dom'); + $PAGE->requires->yui2_lib('dom'); $PAGE->requires->js('mod/url/functions.js'); $PAGE->requires->js_function_call('imscp_setup_object')->on_dom_ready(); } diff --git a/mod/quiz/attemptlib.php b/mod/quiz/attemptlib.php index aa9ce353cb..7209f507f0 100644 --- a/mod/quiz/attemptlib.php +++ b/mod/quiz/attemptlib.php @@ -737,8 +737,8 @@ class quiz_attempt extends quiz { global $PAGE; // The JS does important things like navigation and so must be initialised // as seen as possible, particularly if the page is loading slowly. - $PAGE->requires->yui_lib('dom')->in_head(); - $PAGE->requires->yui_lib('event')->in_head(); + $PAGE->requires->yui2_lib('dom')->in_head(); + $PAGE->requires->yui2_lib('event')->in_head(); $PAGE->requires->js('mod/quiz/quiz.js')->in_head(); get_html_head_contributions($this->get_question_ids($page), $this->questions, $this->states); } diff --git a/mod/quiz/edit.php b/mod/quiz/edit.php index c3310139bd..0f98ab10ae 100644 --- a/mod/quiz/edit.php +++ b/mod/quiz/edit.php @@ -50,8 +50,8 @@ require_once('../../config.php'); require_once($CFG->dirroot . '/mod/quiz/editlib.php'); require_once($CFG->dirroot . '/question/category_class.php'); -$PAGE->requires->yui_lib('container'); -$PAGE->requires->yui_lib('dragdrop'); +$PAGE->requires->yui2_lib('container'); +$PAGE->requires->yui2_lib('dragdrop'); /** * Callback function called from question_list() function diff --git a/mod/quiz/mod_form.php b/mod/quiz/mod_form.php index 83b98d6c93..f246659c1a 100644 --- a/mod/quiz/mod_form.php +++ b/mod/quiz/mod_form.php @@ -111,7 +111,7 @@ class mod_quiz_mod_form extends moodleform_mod { if (!empty($this->_cm)) { $pagegroup[] = &$mform->createElement('checkbox', 'repaginatenow', '', get_string('repaginatenow', 'quiz'), array('id' => 'id_repaginatenow')); $mform->disabledIf('repaginatenow', 'shufflequestions', 'eq', 1); - $PAGE->requires->yui_lib('event'); + $PAGE->requires->yui2_lib('event'); $PAGE->requires->js('mod/quiz/edit.js'); } diff --git a/mod/quiz/view.php b/mod/quiz/view.php index 093135aba6..14ac628a6c 100644 --- a/mod/quiz/view.php +++ b/mod/quiz/view.php @@ -66,7 +66,7 @@ if ($accessmanager->securewindow_required($canpreview)) { $PAGE->requires->js_function_call('popupchecker',array(get_string('popupblockerwarning', 'quiz'))); } - $PAGE->requires->yui_lib('event'); + $PAGE->requires->yui2_lib('event'); // Note: MDL-19010 there will be further changes to printing header and blocks. // The code will be much nicer than this eventually. diff --git a/mod/resource/locallib.php b/mod/resource/locallib.php index 0c2b499459..169f414f40 100644 --- a/mod/resource/locallib.php +++ b/mod/resource/locallib.php @@ -104,7 +104,7 @@ function resource_display_embed($resource, $cm, $course, $file) { } else { // anything else - just try object tag enlarged as much as possible $code = resourcelib_embed_general($fullurl, $title, $clicktoopen, $mimetype); - $PAGE->requires->yui_lib('dom')->in_head(); + $PAGE->requires->yui2_lib('dom')->in_head(); $PAGE->requires->js('mod/url/functions.js')->in_head(); $PAGE->requires->js_function_call('url_init_object'); } diff --git a/mod/url/locallib.php b/mod/url/locallib.php index f914a3062d..4e7ae7a059 100644 --- a/mod/url/locallib.php +++ b/mod/url/locallib.php @@ -266,7 +266,7 @@ function url_display_embed($url, $cm, $course) { } else { // anything else - just try object tag enlarged as much as possible $code = resourcelib_embed_general($fullurl, $title, $clicktoopen, $mimetype); - $PAGE->requires->yui_lib('dom')->in_head(); + $PAGE->requires->yui2_lib('dom')->in_head(); $PAGE->requires->js('mod/url/functions.js')->in_head(); $PAGE->requires->js_function_call('url_init_object'); } diff --git a/mod/wiki/view.php b/mod/wiki/view.php index b790180cd0..2109d2a336 100644 --- a/mod/wiki/view.php +++ b/mod/wiki/view.php @@ -8,7 +8,7 @@ require_once("lib.php"); #require_once("$CFG->dirroot/course/lib.php"); // For side-blocks require_once($CFG->libdir . '/ajax/ajaxlib.php'); - $PAGE->requires->yui_lib('connection'); + $PAGE->requires->yui2_lib('connection'); $ewiki_action = optional_param('ewiki_action', '', PARAM_ALPHA); // Action on Wiki-Page $id = optional_param('id', 0, PARAM_INT); // Course Module ID, or diff --git a/portfolio/download/file.php b/portfolio/download/file.php index 9671f887f5..3fa89d5dfa 100644 --- a/portfolio/download/file.php +++ b/portfolio/download/file.php @@ -13,7 +13,7 @@ if (empty($CFG->enableportfolios)) { require_once($CFG->libdir.'/portfoliolib.php'); require_once($CFG->libdir.'/portfolio/exporter.php'); -$PAGE->requires->yui_lib('dom'); +$PAGE->requires->yui2_lib('dom'); $id = required_param('id', PARAM_INT); require_login(); diff --git a/question/editlib.php b/question/editlib.php index 30dad125f1..df9a6c6cc6 100644 --- a/question/editlib.php +++ b/question/editlib.php @@ -816,7 +816,7 @@ class question_bank_view { $this->init_columns($this->wanted_columns()); $this->init_sort(); - $PAGE->requires->yui_lib('container'); + $PAGE->requires->yui2_lib('container'); } protected function wanted_columns() { @@ -1935,8 +1935,8 @@ function create_new_question_button($categoryid, $params, $caption, $tooltip = ' echo $OUTPUT->button($form); echo $OUTPUT->help_icon(moodle_help_icon::make('types', get_string('createnewquestion', 'question'), 'question')); - $PAGE->requires->yui_lib('dragdrop'); - $PAGE->requires->yui_lib('container'); + $PAGE->requires->yui2_lib('dragdrop'); + $PAGE->requires->yui2_lib('container'); if (!$choiceformprinted) { echo '
'; print_choose_qtype_to_add_form(array()); diff --git a/repository/lib.php b/repository/lib.php index 2e7cee78f3..c68a0e432b 100644 --- a/repository/lib.php +++ b/repository/lib.php @@ -1763,19 +1763,19 @@ function repository_setup_default_plugins() { function repository_head_setup() { global $PAGE; - $PAGE->requires->yui_lib('yahoo')->in_head(); - $PAGE->requires->yui_lib('dom')->in_head(); - $PAGE->requires->yui_lib('element')->in_head(); - $PAGE->requires->yui_lib('event')->in_head(); - $PAGE->requires->yui_lib('json')->in_head(); - $PAGE->requires->yui_lib('treeview')->in_head(); - $PAGE->requires->yui_lib('dragdrop')->in_head(); - $PAGE->requires->yui_lib('container')->in_head(); - $PAGE->requires->yui_lib('resize')->in_head(); - $PAGE->requires->yui_lib('layout')->in_head(); - $PAGE->requires->yui_lib('connection')->in_head(); - $PAGE->requires->yui_lib('button')->in_head(); - $PAGE->requires->yui_lib('selector')->in_head(); + $PAGE->requires->yui2_lib('yahoo')->in_head(); + $PAGE->requires->yui2_lib('dom')->in_head(); + $PAGE->requires->yui2_lib('element')->in_head(); + $PAGE->requires->yui2_lib('event')->in_head(); + $PAGE->requires->yui2_lib('json')->in_head(); + $PAGE->requires->yui2_lib('treeview')->in_head(); + $PAGE->requires->yui2_lib('dragdrop')->in_head(); + $PAGE->requires->yui2_lib('container')->in_head(); + $PAGE->requires->yui2_lib('resize')->in_head(); + $PAGE->requires->yui2_lib('layout')->in_head(); + $PAGE->requires->yui2_lib('connection')->in_head(); + $PAGE->requires->yui2_lib('button')->in_head(); + $PAGE->requires->yui2_lib('selector')->in_head(); //TODO: remove the ->in_head() once we refactor the inline script tags in repo code $PAGE->requires->js('repository/repository.src.js')->in_head(); diff --git a/tag/edit.php b/tag/edit.php index 4a04427392..f6521f5b22 100644 --- a/tag/edit.php +++ b/tag/edit.php @@ -33,8 +33,8 @@ $PAGE->set_context($systemcontext); $PAGE->set_blocks_editing_capability('moodle/tag:editblocks'); $PAGE->set_pagelayout('form'); -$PAGE->requires->yui_lib('animation'); -$PAGE->requires->yui_lib('autocomplete'); +$PAGE->requires->yui2_lib('animation'); +$PAGE->requires->yui2_lib('autocomplete'); $tagname = tag_display_name($tag); diff --git a/theme/lines/meta.php b/theme/lines/meta.php index d6c65796b9..f1713a3592 100755 --- a/theme/lines/meta.php +++ b/theme/lines/meta.php @@ -1,6 +1,6 @@ requires->yui_lib('animation')->asap(); ?> +echo $PAGE->requires->yui2_lib('animation')->asap(); ?>