Index: lams_monitoring/web/includes/javascript/monitorLesson.js
===================================================================
diff -u -rb25b77e1cfc057bfef11ca865fbe9e72c085b0dc -r29b37b4eef36e73fa22c6af4d0c39219cf8994e1
--- lams_monitoring/web/includes/javascript/monitorLesson.js (.../monitorLesson.js) (revision b25b77e1cfc057bfef11ca865fbe9e72c085b0dc)
+++ lams_monitoring/web/includes/javascript/monitorLesson.js (.../monitorLesson.js) (revision 29b37b4eef36e73fa22c6af4d0c39219cf8994e1)
@@ -2262,6 +2262,10 @@
//********** COMMON FUNCTIONS **********
+function isAutoRefreshBlocked(){
+ return autoRefreshBlocked || $('#learnerGroupDialog').hasClass('in');
+}
+
/**
* Updates all changeable elements of monitoring screen.
*/
@@ -2273,12 +2277,12 @@
if (!autoRefreshIntervalObject) {
autoRefreshIntervalObject = setInterval(function(){
- if (!autoRefreshBlocked) {
+ if (!isAutoRefreshBlocked()) {
refreshMonitor(null, true);
}
}, autoRefreshInterval);
}
-
+
if (!tabName) {
// update Lesson tab widgets (state, number of learners etc.)
updateLessonTab();
Index: lams_tool_scratchie/web/pages/learning/results.jsp
===================================================================
diff -u -rbe905fe69c81781ca8c63f0772393bab29be0b8e -r29b37b4eef36e73fa22c6af4d0c39219cf8994e1
--- lams_tool_scratchie/web/pages/learning/results.jsp (.../results.jsp) (revision be905fe69c81781ca8c63f0772393bab29be0b8e)
+++ lams_tool_scratchie/web/pages/learning/results.jsp (.../results.jsp) (revision 29b37b4eef36e73fa22c6af4d0c39219cf8994e1)
@@ -150,7 +150,7 @@
{name:'burningQuestion', index:'burningQuestion', width:501, edittype: 'textarea', title: false, editoptions:{rows:"8"},
formatter:function(cellvalue, options, rowObject, event) {
if (event == "edit") {
- cellvalue = cellvalue.replace(/\n/g, '
');
+ cellvalue = cellvalue.replace(/\n/g, '\n
');
}
var item = $(this).jqGrid("getLocalRow", options.rowId);