MDL-21400 removing some YUI2 extras

moodle · Feb 6, 2010 · 26114d5 · 26114d5
1 parent 3244d9c
commit 26114d5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/lib/ajax/ajaxlib.php b/lib/ajax/ajaxlib.php
@@ -235,18 +235,14 @@ protected function init_requirements_data(moodle_page $page, core_renderer $rend
         );
         if (debugging('', DEBUG_DEVELOPER)) {
             $this->M_cfg['developerdebug'] = true;
-        }
-
-        if (debugging('', DEBUG_DEVELOPER)) {
             $this->yui2_lib('logger');
         }
 
         // accessibility stuff
         $this->skip_link_to('maincontent', get_string('tocontent', 'access'));
 
-        // For now include YUI2, this will be removed before beta.
-        $this->yui2_lib('dom');        // needs to be migrated to YUI3 before we release 2.0
-        $this->yui2_lib('container');  // needs to be migrated to YUI3 before we release 2.0
+        // to be removed soon
+        $this->yui2_lib('dom');        // at least javascript-static.js needs to be migrated to YUI3
 
         $this->string_for_js('confirmation', 'admin');
         $this->string_for_js('cancel', 'moodle');

diff --git a/lib/javascript-static.js b/lib/javascript-static.js
@@ -161,7 +161,7 @@ M.util.CollapsibleRegion.prototype.icon = null;
  * on-the-fly asynchronously
  */
 M.util.init_help_icons = function(Y) {
-    Y.use('yui2-dom, yui2-container, io', function(Y) {
+    Y.use('io', 'yui2-dom', 'yui2-container', function(Y) {
         // remove all titles, they would obscure the YUI tooltip
         Y.all('span.helplink a').each(function(node) {
             node.set('title', '');