MDL-21187 brand new yui2 lib loading now using the official YAHOO oho…

…loaders which properly resolves all dependencies; please note we are still suing the YUI2 CSS preloading

comment/index.php

@@ -28,13 +28,13 @@
 $context = get_context_instance(CONTEXT_SYSTEM);
 require_capability('moodle/comment:delete', $context);
 
-$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();
+$PAGE->requires->yui2_lib('yahoo');
+$PAGE->requires->yui2_lib('dom');
+$PAGE->requires->yui2_lib('event');
+$PAGE->requires->yui2_lib('animation');
+$PAGE->requires->yui2_lib('json');
+$PAGE->requires->yui2_lib('connection');
+$PAGE->requires->js('comment/admin.js');
 
 $action     = optional_param('action', '', PARAM_ALPHA);
 $commentid  = optional_param('commentid', 0, PARAM_INT);

course/view.php

@@ -158,11 +158,11 @@
                                                              // Course-based switches
 
             if (ajaxenabled($CFG->ajaxtestedbrowsers)) {     // Browser, user and site-based switches
-                $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();
+                $PAGE->requires->yui2_lib('dragdrop');
+                $PAGE->requires->yui2_lib('connection');
+                $PAGE->requires->yui2_lib('selector');
+                $PAGE->requires->js('lib/ajax/block_classes.js');
+                $PAGE->requires->js('lib/ajax/section_classes.js');
 
                 // Okay, global variable alert. VERY UGLY. We need to create
                 // this object here before the <blockname>_print_block()
@@ -178,8 +178,8 @@
 
     $completion = new completion_info($course);
     if ($completion->is_enabled() && ajaxenabled()) {
-        $PAGE->requires->yui2_lib('connection')->asap();
-        $PAGE->requires->js('course/completion.js')->asap();
+        $PAGE->requires->yui2_lib('connection');
+        $PAGE->requires->js('course/completion.js')->in_head();
         $PAGE->requires->js_function_call('completion_init')->on_dom_ready();
         $PAGE->requires->data_for_js('completion_strsaved', get_string('saved', 'completion'));
         $PAGE->requires->data_for_js('completion_strtitley', get_string('completion-title-manual-y', 'completion'));

lib/commentlib.php

@@ -178,12 +178,12 @@ public static function js() {
         self::$comment_context = optional_param('comment_context', '', PARAM_INT);
         self::$comment_area    = optional_param('comment_area',    '', PARAM_ALPHAEXT);
 
-        $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->yui2_lib('yahoo');
+        $PAGE->requires->yui2_lib('dom');
+        $PAGE->requires->yui2_lib('event');
+        $PAGE->requires->yui2_lib('animation');
+        $PAGE->requires->yui2_lib('json');
+        $PAGE->requires->yui2_lib('connection');
         $PAGE->requires->js('comment/comment.js')->in_head();
         $PAGE->requires->string_for_js('addcomment', 'moodle');
         $PAGE->requires->string_for_js('deletecomment', 'moodle');

lib/deprecatedlib.php

@@ -1676,7 +1676,7 @@ function use_html_editor($name='', $editorhidebuttons='', $id='') {
  *
  * @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->yui2_lib('yahoo')->asap();
+ *      1. a shorname like 'yui_yahoo'. This translates into a call to $PAGE->requires->yui2_lib('yahoo');
  *      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').
@@ -1696,7 +1696,7 @@ function require_js($lib) {
               'or $PAGE->requires->yui2_lib() instead.', DEBUG_DEVELOPER);
 
     if (strpos($lib, 'yui_') === 0) {
-        echo $PAGE->requires->yui2_lib(substr($lib, 4))->asap();
+        $PAGE->requires->yui2_lib(substr($lib, 4));
     } else if (preg_match('/^https?:/', $lib)) {
         echo $PAGE->requires->js(str_replace($CFG->wwwroot, '', $lib))->asap();
     } else {

lib/outputrenderers.php

@@ -371,8 +371,8 @@ public function standard_head_html() {
 
         // 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->yui2_lib('event')->in_head();
-            $this->page->requires->yui2_lib('connection')->in_head();
+            $this->page->requires->yui2_lib('event');
+            $this->page->requires->yui2_lib('connection');
             $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()));

lib/resourcelib.php

@@ -167,7 +167,7 @@ function resourcelib_embed_mp3($fullurl, $title, $clicktoopen) {
 </div>
 OET;
 
-    $PAGE->requires->yui2_lib('dom')->in_head();
+    $PAGE->requires->yui2_lib('dom');
     $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();
@@ -213,7 +213,7 @@ function resourcelib_embed_flashvideo($fullurl, $title, $clicktoopen) {
 </div>
 EOT;
 
-    $PAGE->requires->yui2_lib('dom')->in_head();
+    $PAGE->requires->yui2_lib('dom');
     $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();

mod/chat/gui_ajax/index.php

@@ -91,7 +91,7 @@
 $PAGE->requires->string_for_js('talk', 'chat');
 
 $PAGE->requires->js('mod/chat/gui_ajax/script.js');
-$PAGE->requires->yui2_lib('animation')->in_head();
+$PAGE->requires->yui2_lib('animation');
 
 $PAGE->add_body_class('yui-skin-sam');
 $PAGE->set_pagelayout('embedded');

mod/imscp/view.php

@@ -46,14 +46,14 @@
 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->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->yui2_lib('json');
+$PAGE->requires->yui2_lib('event');
+$PAGE->requires->yui2_lib('treeview');
+$PAGE->requires->yui2_lib('layout');
+$PAGE->requires->yui2_lib('button');
+$PAGE->requires->yui2_lib('container');
+$PAGE->requires->yui2_lib('dragdrop');
+$PAGE->requires->yui2_lib('resize');
 $PAGE->requires->js('mod/imscp/functions.js')->in_head();
 
 $PAGE->requires->string_for_js('navigation', 'imscp');

mod/quiz/attemptlib.php

@@ -722,8 +722,8 @@ public function get_html_head_contributions($page = 'all') {
         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->yui2_lib('dom')->in_head();
-        $PAGE->requires->yui2_lib('event')->in_head();
+        $PAGE->requires->yui2_lib('dom');
+        $PAGE->requires->yui2_lib('event');
         $PAGE->requires->js('mod/quiz/quiz.js')->in_head();
         get_html_head_contributions($this->get_question_ids($page), $this->questions, $this->states);
     }

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->yui2_lib('dom')->in_head();
+        $PAGE->requires->yui2_lib('dom');
         $PAGE->requires->js('mod/url/functions.js')->in_head();
         $PAGE->requires->js_function_call('url_init_object');
     }

mod/url/locallib.php

@@ -265,7 +265,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->yui2_lib('dom')->in_head();
+        $PAGE->requires->yui2_lib('dom');
         $PAGE->requires->js('mod/url/functions.js')->in_head();
         $PAGE->requires->js_function_call('url_init_object');
     }

repository/lib.php

@@ -1763,19 +1763,19 @@ function repository_setup_default_plugins() {
 function repository_head_setup() {
     global $PAGE;
 
-    $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();
+    $PAGE->requires->yui2_lib('yahoo');
+    $PAGE->requires->yui2_lib('dom');
+    $PAGE->requires->yui2_lib('element');
+    $PAGE->requires->yui2_lib('event');
+    $PAGE->requires->yui2_lib('json');
+    $PAGE->requires->yui2_lib('treeview');
+    $PAGE->requires->yui2_lib('dragdrop');
+    $PAGE->requires->yui2_lib('container');
+    $PAGE->requires->yui2_lib('resize');
+    $PAGE->requires->yui2_lib('layout');
+    $PAGE->requires->yui2_lib('connection');
+    $PAGE->requires->yui2_lib('button');
+    $PAGE->requires->yui2_lib('selector');
 
     //TODO: remove the ->in_head() once we refactor the inline script tags in repo code
     $PAGE->requires->js('repository/repository.src.js')->in_head();

theme/lines/meta.php

@@ -1,6 +1,7 @@
 <?php
 
-echo $PAGE->requires->yui2_lib('animation')->asap(); ?>
+$PAGE->requires->yui2_lib('animation');
+echo $PAGE->requires->get_yui2lib_code(); ?>
 
 <!--[if IE 7]>
     <link rel="stylesheet" type="text/css" href="<?php echo $CFG->httpsthemewww ?>/lines/styles_ie7.css" />