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

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

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2011-08-16 01:52:59 +02:00
parent 485b56ee87 6917eee804
commit 70fc3fb919
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/scorm/locallib.php
+5 -2
View File
@@ -1303,6 +1303,7 @@ function scorm_get_toc($user,$scorm,$cmid,$toclink=TOCJSLINK,$currentorg='',$sco
$nextid = 0;
$findnext = false;
$parents[$level]='/';
$prevsco = '';
foreach ($scoes as $pos => $sco) {
$isvisible = false;
$sco->title = $sco->title;
@@ -1418,8 +1419,9 @@ function scorm_get_toc($user,$scorm,$cmid,$toclink=TOCJSLINK,$currentorg='',$sco
if ($sco->id == $scoid) {
$result->prerequisites = true;
}
if ($toclink == TOCFULLURL) { //display toc with urls for structure page
if (!empty($prevsco) && scorm_version_check($scorm->version, SCORM_13) && !empty($prevsco->hidecontinue)) {
$result->toc .= '<span>'.$statusicon.'&nbsp;'.format_string($sco->title).'</span>';
} else if ($toclink == TOCFULLURL) { //display toc with urls for structure page
$url = $CFG->wwwroot.'/mod/scorm/player.php?a='.$scorm->id.'&amp;currentorg='.$currentorg.$modestr.'&amp;scoid='.$sco->id;
$result->toc .= $statusicon.'&nbsp;<a href="'.$url.'">'.format_string($sco->title).'</a>'.$score."\n";
} else { //display toc for inside scorm player
@@ -1454,6 +1456,7 @@ function scorm_get_toc($user,$scorm,$cmid,$toclink=TOCJSLINK,$currentorg='',$sco
$nextid = $nextsco->id;
}
}
$prevsco = $sco;
}
for ($i=0;$i<$level;$i++) {
$result->toc .= "\t\t</ul></li>\n";
mod/scorm/module.js
+5 -5
View File
@@ -146,11 +146,11 @@ M.mod_scorm.init = function(Y, hide_nav, hide_toc, toc_title, window_name, launc
* @return void
*/
var scorm_fixnav = function() {
scorm_buttons[0].set('disabled', (scorm_skipprev(scorm_current_node) == null));
scorm_buttons[1].set('disabled', (scorm_prev(scorm_current_node) == null));
scorm_buttons[2].set('disabled', (scorm_up(scorm_current_node) == null));
scorm_buttons[3].set('disabled', (scorm_next(scorm_current_node) == null));
scorm_buttons[4].set('disabled', (scorm_skipnext(scorm_current_node) == null));
scorm_buttons[0].set('disabled', (scorm_skipprev(scorm_current_node) == null || scorm_skipprev(scorm_current_node).title == null));
scorm_buttons[1].set('disabled', (scorm_prev(scorm_current_node) == null || scorm_prev(scorm_current_node).title == null));
scorm_buttons[2].set('disabled', (scorm_up(scorm_current_node) == null) || scorm_up(scorm_current_node).title == null);
scorm_buttons[3].set('disabled', (scorm_next(scorm_current_node) == null) || scorm_next(scorm_current_node).title == null);
scorm_buttons[4].set('disabled', (scorm_skipnext(scorm_current_node) == null || scorm_skipnext(scorm_current_node).title == null));
};
var scorm_resize_parent = function() {