From ef7329dce088b83a59e61cd053a8b3fa7fa6726d Mon Sep 17 00:00:00 2001 From: Petr Skoda Date: Fri, 19 Aug 2011 10:21:30 +0200 Subject: [PATCH] MDL-28544 workaround for missing YUI 3.4.0 loader info --- lib/outputrequirementslib.php | 36 ++++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/lib/outputrequirementslib.php b/lib/outputrequirementslib.php index 6c7d0e42d39..a90491516fa 100644 --- a/lib/outputrequirementslib.php +++ b/lib/outputrequirementslib.php @@ -105,7 +105,7 @@ class page_requirements_manager { protected $yui2loader; /** YUI PHPLoader instance responsible for YUI3 loading from PHP only */ protected $yui3loader; - /** YUI PHPLoader instance responsible for YUI3 loading from javascript */ + /** YUI loader information for YUI3 loading from javascript */ protected $M_yui_loader; /** some config vars exposed in JS, please no secret stuff there */ protected $M_cfg; @@ -120,7 +120,7 @@ class page_requirements_manager { require_once("$CFG->libdir/yui/phploader/phploader/loader.php"); - $this->yui3loader = new YAHOO_util_Loader($CFG->yui3version); + $this->yui3loader = new stdClass(); $this->yui2loader = new YAHOO_util_Loader($CFG->yui2version); // set up some loader options @@ -201,11 +201,6 @@ class page_requirements_manager { $this->js_module($this->find_module('core_filepicker')); $this->js_module($this->find_module('core_dock')); - // YUI3 init code - $libs = array('cssreset', 'cssbase', 'cssfonts', 'cssgrids', 'node', 'loader'); // full CSS reset + basic libs - foreach ($libs as $lib) { - $this->yui3loader->load($lib); - } } /** @@ -960,10 +955,29 @@ class page_requirements_manager { * @return string */ protected function get_yui3lib_headcode() { - $code = $this->yui3loader->tags(); - // unfortunately yui loader does not produce xhtml strict code, so let's fix it for now - $code = str_replace('&', '&', $code); - $code = str_replace('&', '&', $code); + global $CFG; + + $code = ''; + + if ($this->yui3loader->combine) { + $code .= ''; + } else { + $code .= ''; + $code .= ''; + $code .= ''; + $code .= ''; + } + + if (debugging('', DEBUG_DEVELOPER)) { + $code .= ''; + } else { + $code .= ''; + } + return $code; } -- 2.43.0