Merge branch 'master_MDL-36800' of git://github.com/danmarsden/moodle

This commit is contained in:
Damyon Wiese 2013-02-04 11:35:54 +08:00
commit c04dac3473
4 changed files with 4 additions and 4 deletions

View File

@ -246,7 +246,7 @@ require_once($CFG->dirroot.'/mod/scorm/datamodels/callback.js.php');
// trigger TOC update
var sURL = "<?php echo $CFG->wwwroot; ?>" + "/mod/scorm/prereqs.php?a=<?php echo $scorm->id ?>&scoid=<?php echo $scoid ?>&attempt=<?php echo $attempt ?>&mode=<?php echo $mode ?>&currentorg=<?php echo $currentorg ?>&sesskey=<?php echo sesskey(); ?>";
var callback = this.connectPrereqCallback;
YUI.use('yui2-connection', function(Y) {
YUI().use('yui2-connection', function(Y) {
Y.YUI2.util.Connect.asyncRequest('GET', sURL, callback, null);
});
return "true";

View File

@ -18,7 +18,7 @@
this.connectPrereqCallback = {
success: function(o) {
YUI.use('yui2-treeview', 'yui2-layout', function(Y) {
YUI().use('yui2-treeview', 'yui2-layout', function(Y) {
scorm_tree_node = Y.YUI2.widget.TreeView.getTree('scorm_tree');
if (o.responseText !== undefined) {
//alert('got a response: ' + o.responseText);

View File

@ -236,7 +236,7 @@ function SCORMapi1_2() {
// trigger TOC update
var sURL = "<?php echo $CFG->wwwroot; ?>" + "/mod/scorm/prereqs.php?a=<?php echo $scorm->id ?>&scoid=<?php echo $scoid ?>&attempt=<?php echo $attempt ?>&mode=<?php echo $mode ?>&currentorg=<?php echo $currentorg ?>&sesskey=<?php echo sesskey(); ?>";
var callback = this.connectPrereqCallback;
YUI.use('yui2-connection', function(Y) {
YUI().use('yui2-connection', function(Y) {
Y.YUI2.util.Connect.asyncRequest('GET', sURL, callback, null);
});
return result;

View File

@ -367,7 +367,7 @@ function SCORMapi1_3() {
// trigger TOC update
var sURL = "<?php echo $CFG->wwwroot; ?>" + "/mod/scorm/prereqs.php?a=<?php echo $scorm->id ?>&scoid=<?php echo $scoid ?>&attempt=<?php echo $attempt ?>&mode=<?php echo $mode ?>&currentorg=<?php echo $currentorg ?>&sesskey=<?php echo sesskey(); ?>";
var callback = this.connectPrereqCallback;
YUI.use('yui2-connection', function(Y) {
YUI().use('yui2-connection', function(Y) {
Y.YUI2.util.Connect.asyncRequest('GET', sURL, callback, null);
});
} else {