mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-21 00:12:56 +02:00
Code Issues Projects Releases Wiki Activity

MDL-28554 workaround for http://yuilibrary.com/projects/yui3/ticket/2530999

Browse Source 
Do not load io-xdr and io-upload-iframe on the same page.
This commit is contained in:
Petr Skoda 2011-08-25 11:38:34 +02:00
parent 9d753c38d7
commit 0958759dc2
11 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/report/spamcleaner/module.js
View File

@ -104,7 +104,7 @@ M.report_spamcleaner = {
init: function(Y, me) {
var context = M.report_spamcleaner;
Y.use('json', 'io', function (Y) {
Y.use('json', 'io-base', function (Y) {
context.Y = Y;
context.me = me;
if (Y.one("#removeall_btn")) {

2
blocks/navigation/yui/navigation/navigation.js vendored
View File

@ -555,4 +555,4 @@ M.block_navigation = M.block_navigation || {
}
};
}, '@VERSION@', {requires:['base', 'core_dock', 'io', 'node', 'dom', 'event-custom', 'event-delegate', 'json-parse']});
}, '@VERSION@', {requires:['base', 'core_dock', 'io-base', 'node', 'dom', 'event-custom', 'event-delegate', 'json-parse']});

2
course/completion.js
View File

@ -79,7 +79,7 @@ M.core_completion.init = function(Y) {
arguments: {state: state, image: image, ajax: ajax}
};
Y.use('io', function(Y) {
Y.use('io-base', function(Y) {
Y.io(M.cfg.wwwroot+'/course/togglecompletion.php', cfg);
});
};

2
enrol/cohort/yui/quickenrolment/quickenrolment.js vendored
View File

@ -339,4 +339,4 @@ YUI.add('moodle-enrol_cohort-quickenrolment', function(Y) {
}
}
}, '@VERSION@', {requires:['base','node', 'overlay', 'io', 'test', 'json-parse', 'event-delegate', 'dd-plugin', 'event-key', 'moodle-enrol-notification']});
}, '@VERSION@', {requires:['base','node', 'overlay', 'io-base', 'test', 'json-parse', 'event-delegate', 'dd-plugin', 'event-key', 'moodle-enrol-notification']});

2
enrol/manual/yui/quickenrolment/quickenrolment.js vendored
View File

@ -516,4 +516,4 @@ YUI.add('moodle-enrol_manual-quickenrolment', function(Y) {
}
}
}, '@VERSION@', {requires:['base','node', 'overlay', 'io', 'test', 'json-parse', 'event-delegate', 'dd-plugin', 'event-key', 'moodle-enrol-notification']});
}, '@VERSION@', {requires:['base','node', 'overlay', 'io-base', 'test', 'json-parse', 'event-delegate', 'dd-plugin', 'event-key', 'moodle-enrol-notification']});

2
enrol/yui/otherusersmanager/otherusersmanager.js vendored
View File

@ -391,4 +391,4 @@ YUI.add('moodle-enrol-otherusersmanager', function(Y) {
}
}
}, '@VERSION@', {requires:['base','node', 'overlay', 'io', 'test', 'json-parse', 'event-delegate', 'dd-plugin', 'event-key', 'moodle-enrol-notification']});
}, '@VERSION@', {requires:['base','node', 'overlay', 'io-base', 'test', 'json-parse', 'event-delegate', 'dd-plugin', 'event-key', 'moodle-enrol-notification']});

2
enrol/yui/rolemanager/rolemanager.js vendored
View File

@ -416,4 +416,4 @@ YUI.add('moodle-enrol-rolemanager', function(Y) {
}
}
}, '@VERSION@', {requires:['base','node','io','json-parse','test','moodle-enrol-notification']});
}, '@VERSION@', {requires:['base','node','io-base','json-parse','test','moodle-enrol-notification']});

2
grade/report/grader/lib.php
View File

@ -1039,7 +1039,7 @@ class grade_report_grader extends grade_report {
$module = array(
'name' => 'gradereport_grader',
'fullpath' => '/grade/report/grader/module.js',
'requires' => array('base', 'dom', 'event', 'event-mouseenter', 'event-key', 'io', 'json-parse', 'overlay')
'requires' => array('base', 'dom', 'event', 'event-mouseenter', 'event-key', 'io-base', 'json-parse', 'overlay')
);
$PAGE->requires->js_init_call('M.gradereport_grader.init_report', $jsarguments, false, $module);
$PAGE->requires->strings_for_js(array('addfeedback','feedback', 'grade'), 'grades');

2
lib/form/filemanager.php
View File

@ -303,7 +303,7 @@ FMHTML;
$module = array(
'name'=>'form_filemanager',
'fullpath'=>'/lib/form/filemanager.js',
'requires' => array('core_filepicker', 'base', 'io', 'node', 'json', 'yui2-button', 'yui2-container', 'yui2-layout', 'yui2-menu', 'yui2-treeview'),
'requires' => array('core_filepicker', 'base', 'io-base', 'node', 'json', 'yui2-button', 'yui2-container', 'yui2-layout', 'yui2-menu', 'yui2-treeview'),
'strings' => array(array('loading', 'repository'), array('nomorefiles', 'repository'), array('confirmdeletefile', 'repository'),
array('add', 'repository'), array('accessiblefilepicker', 'repository'), array('move', 'moodle'),
array('cancel', 'moodle'), array('download', 'moodle'), array('ok', 'moodle'),

2
lib/javascript-static.js
View File

@ -1238,7 +1238,7 @@ M.util.help_icon = {
event.preventDefault();
if (M.util.help_icon.instance === null) {
var Y = M.util.help_icon.Y;
Y.use('overlay', 'io', 'event-mouseenter', 'node', 'event-key', function(Y) {
Y.use('overlay', 'io-base', 'event-mouseenter', 'node', 'event-key', function(Y) {
var help_content_overlay = {
helplink : null,
overlay : null,

8
lib/outputrequirementslib.php
View File

@ -395,7 +395,7 @@ class page_requirements_manager {
case 'core_filepicker':
$module = array('name' => 'core_filepicker',
'fullpath' => '/repository/filepicker.js',
'requires' => array('base', 'node', 'node-event-simulate', 'json', 'async-queue', 'io-base', 'io-upload-iframe', 'yui2-button', 'yui2-container', 'yui2-layout', 'yui2-menu', 'yui2-treeview', 'yui2-dragdrop', 'yui2-cookie'),
'requires' => array('base', 'node', 'node-event-simulate', 'json', 'async-queue', 'io-base', 'io-upload-iframe', 'io-form', 'yui2-button', 'yui2-container', 'yui2-layout', 'yui2-menu', 'yui2-treeview', 'yui2-dragdrop', 'yui2-cookie'),
'strings' => array(array('add', 'repository'), array('back', 'repository'), array('cancel', 'moodle'), array('close', 'repository'),
array('cleancache', 'repository'), array('copying', 'repository'), array('date', 'repository'), array('downloadsucc', 'repository'),
array('emptylist', 'repository'), array('error', 'repository'), array('federatedsearch', 'repository'),
@ -419,7 +419,7 @@ class page_requirements_manager {
case 'core_comment':
$module = array('name' => 'core_comment',
'fullpath' => '/comment/comment.js',
'requires' => array('base', 'io', 'node', 'json', 'yui2-animation', 'overlay'),
'requires' => array('base', 'io-base', 'node', 'json', 'yui2-animation', 'overlay'),
'strings' => array(array('confirmdeletecomments', 'admin'), array('yes', 'moodle'), array('no', 'moodle'))
);
break;
@ -456,12 +456,12 @@ class page_requirements_manager {
case 'core_rating':
$module = array('name' => 'core_rating',
'fullpath' => '/rating/module.js',
'requires' => array('node', 'event', 'overlay', 'io', 'json'));
'requires' => array('node', 'event', 'overlay', 'io-base', 'json'));
break;
case 'core_filetree':
$module = array('name' => 'core_filetree',
'fullpath' => '/files/module.js',
'requires' => array('node', 'event', 'overlay', 'io', 'json', 'yui2-treeview'));
'requires' => array('node', 'event', 'overlay', 'io-base', 'json', 'yui2-treeview'));
break;
}