L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Sam Hemelryk
2013-09-17 09:02:32 +12:00
parent f34af1167a b98dcd7dd6
commit 77365f7ff6
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/scorm/view.js
+1 -2
View File
@@ -4,13 +4,12 @@ M.mod_scormform.init = function(Y) {
var cwidth = scormplayerdata.cwidth;
var cheight = scormplayerdata.cheight;
var poptions = scormplayerdata.popupoptions;
var courseid = scormplayerdata.courseid;
var launch = scormplayerdata.launch;
var currentorg = scormplayerdata.currentorg;
var sco = scormplayerdata.sco;
var scorm = scormplayerdata.scorm;
var launch_url = M.cfg.wwwroot+"/mod/scorm/player.php?a="+scorm+"&currentorg="+currentorg+"&scoid="+sco+"&sesskey="+M.cfg.sesskey;
var course_url = M.cfg.wwwroot+"/course/view.php?id="+courseid+"&sesskey="+M.cfg.sesskey;
var course_url = scormplayerdata.courseurl;
if ((cwidth==100) && (cheight==100)) {
poptions = poptions+',width='+screen.availWidth+',height='+screen.availHeight+',left=0,top=0';
mod/scorm/view.php
+9 -1
View File
@@ -83,11 +83,19 @@ if (!empty($scorm->popup)) {
$launch = true;
}
}
// Redirect back to the section with one section per page ?
$courseformat = course_get_format($course)->get_course();
$sectionid = '';
if (isset($courseformat->coursedisplay) && $courseformat->coursedisplay == COURSE_DISPLAY_MULTIPAGE) {
$sectionid = $cm->section;
}
$PAGE->requires->data_for_js('scormplayerdata', Array('launch' => $launch,
'currentorg' => $orgidentifier,
'sco' => $scoid,
'scorm' => $scorm->id,
'courseid' => $scorm->course,
'courseurl' => course_get_url($course, $sectionid)->out(false),
'cwidth' => $scorm->width,
'cheight' => $scorm->height,
'popupoptions' => $scorm->options), true);