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

MDL-56859 SCORM: player shouldn't display TOC while loading

Browse Source
This commit is contained in:
Bram Tassyns
2016-12-12 09:13:29 +08:00
committed by Jake Dallimore
parent 45fe30fc2d
commit 36b70df814
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/scorm/locallib.php
+2 -2
View File
@@ -1868,7 +1868,7 @@ function scorm_get_toc($user, $scorm, $cmid, $toclink=TOCJSLINK, $currentorg='',
if ($tocheader) {
$result->toc = html_writer::start_div('yui3-g-r', array('id' => 'scorm_layout'));
$result->toc .= html_writer::start_div('yui3-u-1-5', array('id' => 'scorm_toc'));
$result->toc .= html_writer::start_div('yui3-u-1-5 loading', array('id' => 'scorm_toc'));
$result->toc .= html_writer::div('', '', array('id' => 'scorm_toc_title'));
$result->toc .= html_writer::start_div('', array('id' => 'scorm_tree'));
}
@@ -1928,7 +1928,7 @@ function scorm_get_toc($user, $scorm, $cmid, $toclink=TOCJSLINK, $currentorg='',
if ($tocheader) {
$result->toc .= html_writer::end_div().html_writer::end_div();
$result->toc .= html_writer::start_div('', array('id' => 'scorm_toc_toggle'));
$result->toc .= html_writer::start_div('loading', array('id' => 'scorm_toc_toggle'));
$result->toc .= html_writer::tag('button', '', array('id' => 'scorm_toc_toggle_btn')).html_writer::end_div();
$result->toc .= html_writer::start_div('', array('id' => 'scorm_content'));
$result->toc .= html_writer::div('', '', array('id' => 'scorm_navpanel'));
mod/scorm/module.js
+4
View File
@@ -562,6 +562,10 @@ M.mod_scorm.init = function(Y, nav_display, navposition_left, navposition_top, h
}
}
// Basic initialization completed, show the elements.
Y.one('#scorm_toc').removeClass('loading');
Y.one('#scorm_toc_toggle').removeClass('loading');
// TOC Resize handle.
var layout_width = parseInt(Y.one('#scorm_layout').getComputedStyle('width'), 10);
var scorm_resize_handle = new Y.Resize({
mod/scorm/styles.css
+3 -1
View File
@@ -144,7 +144,9 @@
}
#page-mod-scorm-player #scormpage #scorm_toc.disabled,
#page-mod-scorm-player #scormpage #scorm_toc_toggle.disabled {
#page-mod-scorm-player #scormpage #scorm_toc.loading,
#page-mod-scorm-player #scormpage #scorm_toc_toggle.disabled,
#page-mod-scorm-player #scormpage #scorm_toc_toggle.loading {
display: none;
}