Merge branch 'w43_MDL-34915_m24_simpleyui' of git://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 6 Nov 2012 08:03:40 +0000 (16:03 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 6 Nov 2012 08:03:40 +0000 (16:03 +0800)
lib/outputrequirementslib.php

index 1782756..c57b5d0 100644 (file)
@@ -948,13 +948,16 @@ class page_requirements_manager {
                      .$CFG->yui3version.'/build/cssfonts/fonts-min.css&amp;'
                      .$CFG->yui3version.'/build/cssgrids/grids-min.css&amp;'
                      .$CFG->yui3version.'/build/cssbase/base-min.css" />';
-            $code .= '<script type="text/javascript" src="'.$this->yui3loader->comboBase.$CFG->yui3version.'/build/yui/yui-min.js"></script>';
+            $code .= '<script type="text/javascript" src="'.$this->yui3loader->comboBase
+                     .$CFG->yui3version.'/build/simpleyui/simpleyui-min.js&amp;'
+                     .$CFG->yui3version.'/build/loader/loader-min.js"></script>';
         } else {
             $code .= '<link rel="stylesheet" type="text/css" href="'.$this->yui3loader->base.'cssreset/reset-min.css" />';
             $code .= '<link rel="stylesheet" type="text/css" href="'.$this->yui3loader->base.'cssfonts/fonts-min.css" />';
             $code .= '<link rel="stylesheet" type="text/css" href="'.$this->yui3loader->base.'cssgrids/grids-min.css" />';
             $code .= '<link rel="stylesheet" type="text/css" href="'.$this->yui3loader->base.'cssbase/base-min.css" />';
-            $code .= '<script type="text/javascript" src="'.$this->yui3loader->base.'yui/yui-min.js"></script>';
+            $code .= '<script type="text/javascript" src="'.$this->yui3loader->base.'simpleyui/simpleyui-min.js"></script>';
+            $code .= '<script type="text/javascript" src="'.$this->yui3loader->base.'loader/loader-min.js"></script>';
         }