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

Merge branch 'MDL-39219_scorm_ie7' of git://github.com/davosmith/moodle

Browse Source 
Conflicts:
	mod/scorm/module.js
This commit is contained in:
Dan Poltawski 2013-04-19 15:20:02 +01:00
commit b93945e9b9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mod/scorm/module.js
View File

@ -41,7 +41,7 @@ M.mod_scorm.init = function(Y, hide_nav, hide_toc, toc_title, window_name, launc
scorm_disable_toc = true;
}
scoes_nav = JSON.parse(scoes_nav);
scoes_nav = Y.JSON.parse(scoes_nav);
var scorm_current_node;
var scorm_buttons = [];
var scorm_bloody_labelclick = false;
@ -364,7 +364,7 @@ M.mod_scorm.init = function(Y, hide_nav, hide_toc, toc_title, window_name, launc
var datastring = scoes_nav[launch_sco].url + '&function=scorm_seq_flow&request=backward';
result = scorm_ajax_request(M.cfg.wwwroot + '/mod/scorm/datamodels/sequencinghandler.php?', datastring);
mod_scorm_seq = encodeURIComponent(result);
result = JSON.parse (result);
result = Y.JSON.parse (result);
if (typeof result.nextactivity.id != undefined) {
var node = scorm_prev(scorm_tree_node.getHighlightedNode())
if (node == null) {
@ -390,7 +390,7 @@ M.mod_scorm.init = function(Y, hide_nav, hide_toc, toc_title, window_name, launc
var datastring = scoes_nav[launch_sco].url + '&function=scorm_seq_flow&request=forward';
result = scorm_ajax_request(M.cfg.wwwroot + '/mod/scorm/datamodels/sequencinghandler.php?', datastring);
mod_scorm_seq = encodeURIComponent(result);
result = JSON.parse (result);
result = Y.JSON.parse (result);
if (typeof result.nextactivity.id != undefined) {
var node = scorm_next(scorm_tree_node.getHighlightedNode())
if (node == null) {
@ -631,4 +631,4 @@ M.mod_scorm.connectPrereqCallback = {
// TODO: do some sort of error handling.
}
};
};