mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-17 21:49:15 +01:00
Code Issues Projects Releases Wiki Activity

MDL-34741 use proper default YUI_config

Browse Source
This commit is contained in:
Petr Škoda 2012-08-06 10:21:37 +02:00
parent 1c76d55a40
commit 2f422271c2
2 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/javascript-static.js
View File

@ -2,12 +2,12 @@
// Global M object is initilised in inline javascript
/**
* Add module to list of available modules that can be laoded from YUI.
* Add module to list of available modules that can be loaded from YUI.
* @param {Array} modules
*/
M.yui.add_module = function(modules) {
for (var modname in modules) {
M.yui.loader.modules[modname] = modules[modname];
YUI_config.modules[modname] = modules[modname];
}
};
/**
@ -182,7 +182,7 @@ M.util.CollapsibleRegion.prototype.icon = null;
* @param String the value to set it to.
*/
M.util.set_user_preference = function(name, value) {
YUI(M.yui.loader).use('io', function(Y) {
YUI().use('io', function(Y) {
var url = M.cfg.wwwroot + '/lib/ajax/setuserpref.php?sesskey=' +
M.cfg.sesskey + '&pref=' + encodeURI(name) + '&value=' + encodeURI(value);
@ -215,7 +215,7 @@ M.util.show_confirm_dialog = function(e, args) {
e.preventDefault();
}
YUI(M.yui.loader).use('yui2-container', 'yui2-event', function(Y) {
YUI().use('yui2-container', 'yui2-event', function(Y) {
var simpledialog = new YAHOO.widget.SimpleDialog('confirmdialog',
{width: '300px',
fixedcenter: true,
@ -410,7 +410,7 @@ M.util.init_select_autosubmit = function(Y, formid, selectid, nothing) {
* Attach handler to url_select
*/
M.util.init_url_select = function(Y, formid, selectid, nothing) {
YUI(M.yui.loader).use('node', function(Y) {
YUI().use('node', function(Y) {
Y.on('change', function() {
if ((nothing == false && Y.Lang.isBoolean(nothing)) || Y.one('#'+selectid).get('value') != nothing) {
window.location = M.cfg.wwwroot+Y.one('#'+selectid).get('value');

31
lib/outputrequirementslib.php
View File

@ -131,9 +131,9 @@ class page_requirements_manager {
protected $yui3loader;
/**
* @var stdClass YUI loader information for YUI3 loading from javascript
* @var stdClass YUI loader configuration for YUI3 loading from javascript
*/
protected $M_yui_loader;
protected $YUI_config;
/**
* @var array Some config vars exposed in JS, please no secret stuff there
@ -182,14 +182,14 @@ class page_requirements_manager {
}
// set up JS YUI loader helper object
$this->M_yui_loader = new stdClass();
$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 = (string)$this->yui3loader->filter;
$this->M_yui_loader->insertBefore = 'firstthemesheet';
$this->M_yui_loader->modules = array();
$this->M_yui_loader->groups = array(
$this->YUI_config = new stdClass();
$this->YUI_config->base = $this->yui3loader->base;
$this->YUI_config->comboBase = $this->yui3loader->comboBase;
$this->YUI_config->combine = $this->yui3loader->combine;
$this->YUI_config->filter = (string)$this->yui3loader->filter;
$this->YUI_config->insertBefore = 'firstthemesheet';
$this->YUI_config->modules = array();
$this->YUI_config->groups = array(
'moodle' => array(
'name' => 'moodle',
'base' => $CFG->httpswwwroot . '/theme/yui_combo.php'.$sep.'moodle/'.$jsrev.'/',
@ -210,7 +210,7 @@ class page_requirements_manager {
'base' => $CFG->httpswwwroot . '/lib/yui/gallery/',
'comboBase' => $CFG->httpswwwroot . '/theme/yui_combo.php'.$sep,
'combine' => $this->yui3loader->combine,
'filter' => $this->M_yui_loader->filter,
'filter' => $this->YUI_config->filter,
'ext' => false,
'root' => 'gallery/',
'patterns' => array(
@ -512,7 +512,7 @@ class page_requirements_manager {
if ($this->headdone) {
$this->extramodules[$module['name']] = $module;
} else {
$this->M_yui_loader->modules[$module['name']] = $module;
$this->YUI_config->modules[$module['name']] = $module;
}
if (debugging('', DEBUG_DEVELOPER)) {
if (!array_key_exists($module['name'], $this->debug_moduleloadstacktraces)) {
@ -534,7 +534,7 @@ class page_requirements_manager {
} else {
$modulename = $module['name'];
}
return array_key_exists($modulename, $this->M_yui_loader->modules) ||
return array_key_exists($modulename, $this->YUI_config->modules) ||
array_key_exists($modulename, $this->extramodules);
}
@ -1037,7 +1037,8 @@ class page_requirements_manager {
var moodleConfigFn = function(me) {var p = me.path, b = me.name.replace(/^moodle-/,'').split('-', 3), n = b.pop();if (/(skin|core)/.test(n)) {n = b.pop();me.type = 'css';};me.path = b.join('-')+'/'+n+'/'+n+'.'+me.type;};
var galleryConfigFn = function(me) {var p = me.path,v=M.yui.galleryversion,f;if(/-(skin|core)/.test(me.name)) {me.type = 'css';p = p.replace(/-(skin|core)/, '').replace(/\.js/, '.css').split('/'), f = p.pop().replace(/(\-(min|debug))/, '');if (/-skin/.test(me.name)) {p.splice(p.length,0,v,'assets','skins','sam', f);} else {p.splice(p.length,0,v,'assets', f);};} else {p = p.split('/'), f = p.pop();p.splice(p.length,0,v, f);};me.path = p.join('/');};
var yui2in3ConfigFn = function(me) {if(/-skin|reset|fonts|grids|base/.test(me.name)){me.type='css';me.path=me.path.replace(/\.js/,'.css');me.path=me.path.replace(/\/yui2-skin/,'/assets/skins/sam/yui2-skin');}};\n";
$js .= js_writer::set_variable('M.yui.loader', $this->M_yui_loader, false) . "\n";
$js .= js_writer::set_variable('YUI_config', $this->YUI_config, false) . "\n";
$js .= "M.yui.loader = {modules: {}};\n"; // Backwars compatibility only, not used
$js .= js_writer::set_variable('M.cfg', $this->M_cfg, false);
$js = str_replace('"@GALLERYCONFIGFN@"', 'galleryConfigFn', $js);
$js = str_replace('"@MOODLECONFIGFN@"', 'moodleConfigFn', $js);
@ -1142,7 +1143,7 @@ var yui2in3ConfigFn = function(me) {if(/-skin|reset|fonts|grids|base/.test(me.na
$handlersjs = $this->get_event_handler_code();
// there is no global Y, make sure it is available in your scope
$js = "YUI(M.yui.loader).use('node', function(Y) {\n{$inyuijs}{$ondomreadyjs}{$jsinit}{$handlersjs}\n});";
$js = "YUI().use('node', function(Y) {\n{$inyuijs}{$ondomreadyjs}{$jsinit}{$handlersjs}\n});";
$output .= html_writer::script($js);