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

Merge branch 'm24_MDL-37844' of git://github.com/danmarsden/moodle into MOODLE_24_STABLE

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2013-04-16 01:15:06 +02:00
parent dd79ab10b3 18c3001eb4
commit 1e803a3e45
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/scorm/module.js
+12 -4
View File
@@ -24,6 +24,7 @@
mod_scorm_launch_next_sco = null;
mod_scorm_launch_prev_sco = null;
mod_scorm_activate_item = null;
scorm_layout_widget = null;
M.mod_scorm = {};
@@ -41,7 +42,6 @@ M.mod_scorm.init = function(Y, hide_nav, hide_toc, toc_title, window_name, launc
}
scoes_nav = JSON.parse(scoes_nav);
var scorm_layout_widget;
var scorm_current_node;
var scorm_buttons = [];
var scorm_bloody_labelclick = false;
@@ -152,7 +152,7 @@ M.mod_scorm.init = function(Y, hide_nav, hide_toc, toc_title, window_name, launc
scorm_resize_frame();
var left = scorm_layout_widget.getUnitByPosition('left');
if (left.expanded) {
if (left.expand) {
scorm_current_node.focus();
}
if (scorm_hide_nav == false) {
@@ -493,6 +493,15 @@ M.mod_scorm.init = function(Y, hide_nav, hide_toc, toc_title, window_name, launc
tree.expandAll();
tree.render();
// On getting the window, always set the focus on the current item
Y.YUI2.util.Event.on(window, 'focus', function (e) {
var current = scorm_tree_node.getHighlightedNode();
var left = scorm_layout_widget.getUnitByPosition('left');
if (current && left.expand) {
current.focus();
}
});
// navigation
if (scorm_hide_nav == false) {
scorm_nav_panel = new Y.YUI2.widget.Panel('scorm_navpanel', { visible:true, draggable:true, close:false, xy: [250, 450],
@@ -608,9 +617,8 @@ M.mod_scorm.connectPrereqCallback = {
hnode = scorm_tree_node.getNodeByIndex(hidx);
if (hnode) {
hnode.highlight();
scorm_layout_widget = Y.YUI2.widget.Layout.getLayoutById('scorm_layout');
var left = scorm_layout_widget.getUnitByPosition('left');
if (left.expanded) {
if (left.expand) {
hnode.focus();
}
}