L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'w51_MDL-30659_m22_yuidebug' of git://github.com/skodak/moodle into MOODLE_22_STABLE

Browse Source
This commit is contained in:
Sam Hemelryk
2011-12-12 16:37:03 +13:00
parent 6aabb69f9e 5cb418e9f8
commit ba9489ce91
1 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/outputrequirementslib.php
+17 -9
View File
@@ -160,7 +160,7 @@ class page_requirements_manager {
$this->M_yui_loader->base = $this->yui3loader->base;
$this->M_yui_loader->comboBase = $this->yui3loader->comboBase;
$this->M_yui_loader->combine = $this->yui3loader->combine;
$this->M_yui_loader->filter = ($this->yui3loader->filter == YUI_DEBUG) ? 'debug' : '';
$this->M_yui_loader->filter = (string)$this->yui3loader->filter;
$this->M_yui_loader->insertBefore = 'firstthemesheet';
$this->M_yui_loader->modules = array();
$this->M_yui_loader->groups = array(
@@ -267,7 +267,7 @@ class page_requirements_manager {
* Initialise with the bits of JavaScript that every Moodle page should have.
*
* @param moodle_page $page
* @param core_renderer $output
* @param core_renderer $renderer
*/
protected function init_requirements_data(moodle_page $page, core_renderer $renderer) {
global $CFG;
@@ -547,7 +547,7 @@ class page_requirements_manager {
/**
* Returns true if the module has already been loaded.
*
* @param string|array $modulename
* @param string|array $module
* @return bool True if the module has already been loaded
*/
protected function js_module_loaded($module) {
@@ -818,7 +818,7 @@ class page_requirements_manager {
* (e.g. and array) that you pass to JavaScript with {@link data_for_js()}.
*
* @param string $identifier the desired string.
* @param string $module the language file to look in.
* @param string $component the language file to look in.
* @param mixed $a any extra data to add into the string (optional).
*/
public function string_for_js($identifier, $component, $a = NULL) {
@@ -918,7 +918,8 @@ class page_requirements_manager {
/**
* Get the inline JavaScript code that need to appear in a particular place.
* @return bool $ondomready
* @param bool $ondomready
* @return string
*/
protected function get_javascript_code($ondomready) {
$where = $ondomready ? 'ondomready' : 'normal';
@@ -972,10 +973,14 @@ class page_requirements_manager {
$code .= '<link rel="stylesheet" type="text/css" href="'.$this->yui3loader->base.'cssbase/base-min.css" />';
}
if (debugging('', DEBUG_DEVELOPER)) {
$code .= '<script type="text/javascript" src="'.$this->yui3loader->base.'yui/yui-debug.js"></script>';
} else {
$code .= '<script type="text/javascript" src="'.$this->yui3loader->base.'yui/yui-min.js"></script>';
$code .= '<script type="text/javascript" src="'.$this->yui3loader->base.'yui/yui-min.js"></script>';
if ($this->yui3loader->filter === YUI_RAW) {
$code = str_replace('-min.css', '.css', $code);
$code = str_replace('-min.js', '.js', $code);
} else if ($this->yui3loader->filter === YUI_DEBUG) {
$code = str_replace('-min.css', '.css', $code);
$code = str_replace('-min.js', '-debug.js', $code);
}
return $code;
@@ -1045,6 +1050,7 @@ class page_requirements_manager {
/**
* Adds extra modules specified after printing of page header
* @return string
*/
protected function get_extra_modules_code() {
if (empty($this->extramodules)) {
@@ -1059,6 +1065,8 @@ class page_requirements_manager {
* Normally, this method is called automatically by the code that prints the
* <head> tag. You should not normally need to call it in your own code.
*
* @param moodle_page $page
* @param core_renderer $renderer
* @return string the HTML code to to inside the <head> tag.
*/
public function get_head_code(moodle_page $page, core_renderer $renderer) {