Permalink
Browse files

Merge branch 'MDL-39219_scorm_ie7_24' of git://github.com/davosmith/m…

…oodle into MOODLE_24_STABLE

Conflicts:
	mod/scorm/module.js
  • Loading branch information...
2 parents d9a2776 + 76bb36d commit 6f69ef749e05f0164b8e4325c3bc064f210f9031 @danpoltawski danpoltawski committed Apr 19, 2013
Showing with 4 additions and 4 deletions.
  1. +4 −4 mod/scorm/module.js
View
@@ -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.
}
-};
+};

0 comments on commit 6f69ef7

Please sign in to comment.