Index: lams_learning/lams_learning.eml =================================================================== diff -u -r966fe6dea3c644eaf336f305c960861b7e62fd73 -r89f41df2ea71b152595e2497fd3ca690e5464d16 --- lams_learning/lams_learning.eml (.../lams_learning.eml) (revision 966fe6dea3c644eaf336f305c960861b7e62fd73) +++ lams_learning/lams_learning.eml (.../lams_learning.eml) (revision 89f41df2ea71b152595e2497fd3ca690e5464d16) @@ -3,6 +3,7 @@ + Index: lams_learning/web/includes/javascript/learnerPage.js =================================================================== diff -u -rcd376b6f01522589c2f68b3c548390c23e79ce01 -r89f41df2ea71b152595e2497fd3ca690e5464d16 --- lams_learning/web/includes/javascript/learnerPage.js (.../learnerPage.js) (revision cd376b6f01522589c2f68b3c548390c23e79ce01) +++ lams_learning/web/includes/javascript/learnerPage.js (.../learnerPage.js) (revision 89f41df2ea71b152595e2497fd3ca690e5464d16) @@ -88,20 +88,23 @@ function toggleProgressBar(forceClose) { let pageContent = $('.component-page-wrapper .component-page-content'), + progressBar = $('.component-page-wrapper .component-sidebar'), topToggleButton = $('header .sidebar-toggle-button', pageContent), isExpanded = forceClose || topToggleButton.attr('aria-expanded') == 'true'; topToggleButton.attr('aria-expanded', !isExpanded) .children('i').toggleClass(topToggleButton.data('closed-class')).toggleClass(topToggleButton.data('opened-class')); - $('.component-page-wrapper .component-sidebar').toggleClass('active').attr('aria-expanded', !isExpanded); - $('.component-sidebar').focus(); + progressBar.toggleClass('active').attr('aria-expanded', !isExpanded); - pageContent.off('click'); $('body').off('keyup'); - if (!isExpanded) { - pageContent.one('click', function (){ - toggleProgressBar(true); - }); + if (isExpanded) { + progressBar.attr('inert', ''); + pageContent.removeAttr('inert'); + } else { + pageContent.attr('inert', ''); + progressBar.removeAttr('inert'); + $('.sidebar-toggle-button', progressBar).focus(); + $('body').on('keyup', function (event){ if (event.key === "Escape") { toggleProgressBar(true); Index: lams_tool_nb/web/WEB-INF/tags/PageLearner.tag =================================================================== diff -u -r6ea65384311c0e9e85c3783f311f594f79aa63d0 -r89f41df2ea71b152595e2497fd3ca690e5464d16 --- lams_tool_nb/web/WEB-INF/tags/PageLearner.tag (.../PageLearner.tag) (revision 6ea65384311c0e9e85c3783f311f594f79aa63d0) +++ lams_tool_nb/web/WEB-INF/tags/PageLearner.tag (.../PageLearner.tag) (revision 89f41df2ea71b152595e2497fd3ca690e5464d16) @@ -54,6 +54,26 @@
+ +
Skip to main content @@ -94,30 +114,7 @@ - -
- - - -