Index: lams_central/web/includes/javascript/progressBar.js =================================================================== diff -u -r4be52b69f493859875a40eb81855b0bd917e63ca -rf69c22db18ae4be82e40f9e66a6b5c6efe8890da --- lams_central/web/includes/javascript/progressBar.js (.../progressBar.js) (revision 4be52b69f493859875a40eb81855b0bd917e63ca) +++ lams_central/web/includes/javascript/progressBar.js (.../progressBar.js) (revision f69c22db18ae4be82e40f9e66a6b5c6efe8890da) @@ -349,7 +349,7 @@ // label underneath the shape var label = null, - content = activity.name; + content = activity.name || ''; if (isHorizontalBar) { // cut lengthy activity names so they don't overlap if (content.length > 23) { @@ -1023,9 +1023,9 @@ $.ajax({ url : LAMS_URL + 'monitoring/monitoring.do', data : { - 'method' : 'getLearnerProgress', + 'method' : 'getLearnerProgress', 'lessonID' : lessonId, - 'userID' : bar.userId + 'userID' : bar.userId }, cache : false, dataType : 'json', @@ -1135,13 +1135,13 @@ } // draw support activities if they exist - if (result.support - && !supportSeparatorRow.is(':visible')) { + var supportSeparatorRow = $('#supportSeparatorRow'); + if (result.support && supportSeparatorRow.length > 0 && !supportSeparatorRow.is(':visible')) { supportSeparatorRow.show(); - supportPart.height(17 + 33 * result.support.length) - .show(); + $('#supportPart').height(17 + 33 * result.support.length) + .show(); - // separate paper for Suppor Activities frame + // separate paper for Support Activities frame var supportPaper = Raphael('supportPart'); $.each(result.support, function(activityIndex, Index: lams_learning/web/main.jsp =================================================================== diff -u -ra74069c34b714d11dc325ed73abc77383d75c1e1 -rf69c22db18ae4be82e40f9e66a6b5c6efe8890da --- lams_learning/web/main.jsp (.../main.jsp) (revision a74069c34b714d11dc325ed73abc77383d75c1e1) +++ lams_learning/web/main.jsp (.../main.jsp) (revision f69c22db18ae4be82e40f9e66a6b5c6efe8890da) @@ -58,9 +58,6 @@ TOSTART_ACTIVITY : '', SUPPORT_ACTIVITY : '' }, - - supportSeparatorRow = null, - supportPart = null, parentURL = "${notifyCloseURL}", lessonId = '${param.lessonID}', @@ -84,10 +81,6 @@ // show if panel is not disabled in LAMS Configuration if (progressPanelEnabled) { - // these DOM elements are accessed often, so cache reference to them - supportSeparatorRow = $('#supportSeparatorRow'); - supportPart = $('#supportPart'); - $('body').layout({ west : { applyDefaultStyles : true,