Permalink
Browse files

Merge branch 'master_MDL-58863' of https://github.com/danmarsden/moodle

  • Loading branch information...
dmonllao committed Jul 18, 2017
2 parents ed539f8 + e63d724 commit a0f12fcafc85785dbfa55c45724a68346dec9e2b
Showing with 4 additions and 2 deletions.
  1. +2 −1 mod/scorm/player.php
  2. +2 −1 mod/scorm/view.php
@@ -272,7 +272,8 @@
$scorm->hidetoc, $collapsetocwinsize, $result->toctitle, $name, $sco->id, $adlnav), false, $jsmodule);
}
if (!empty($forcejs)) {
echo $OUTPUT->box(get_string("forcejavascriptmessage", "scorm"), "generalbox boxaligncenter forcejavascriptmessage");
$message = $OUTPUT->box(get_string("forcejavascriptmessage", "scorm"), "generalbox boxaligncenter forcejavascriptmessage");
echo html_writer::tag('noscript', $message);
}
if (file_exists($CFG->dirroot.'/mod/scorm/datamodels/'.$scorm->version.'.php')) {
@@ -176,7 +176,8 @@
scorm_print_launch($USER, $scorm, 'view.php?id='.$cm->id, $cm);
}
if (!empty($forcejs)) {
echo $OUTPUT->box(get_string("forcejavascriptmessage", "scorm"), "container forcejavascriptmessage");
$message = $OUTPUT->box(get_string("forcejavascriptmessage", "scorm"), "container forcejavascriptmessage");
echo html_writer::tag('noscript', $message);
}
if (!empty($scorm->popup)) {

0 comments on commit a0f12fc

Please sign in to comment.