Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/controller/MonitoringController.java
===================================================================
diff -u -r3317bc79e858810750b2d6aacbcb4a0a6d36b841 -r9bc29026b38d8068d7be685e2a627890af31db33
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 3317bc79e858810750b2d6aacbcb4a0a6d36b841)
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 9bc29026b38d8068d7be685e2a627890af31db33)
@@ -328,7 +328,7 @@
userData.add(i);
userData.add((String)ratingDetails[4]);
String commentText = HtmlUtils.htmlEscape(comment);
- commentText = StringUtils.replace(commentText, "<BR>", "
");
+ commentText = StringUtils.replace(commentText, "<BR>", "
").replace("\n", "
");
userData.add(commentText);
userData.add("Comments");
Index: lams_tool_preview/web/pages/learning/hedging.jsp
===================================================================
diff -u -r1042117ad93a6a9f93d8b1c8be7e718b7efd383f -r9bc29026b38d8068d7be685e2a627890af31db33
--- lams_tool_preview/web/pages/learning/hedging.jsp (.../hedging.jsp) (revision 1042117ad93a6a9f93d8b1c8be7e718b7efd383f)
+++ lams_tool_preview/web/pages/learning/hedging.jsp (.../hedging.jsp) (revision 9bc29026b38d8068d7be685e2a627890af31db33)
@@ -44,21 +44,12 @@
function validateJustification() {
-
- var justify = document.getElementById("justify");
-
- //replace special characters with HTML tags
- var tempTextarea = jQuery('');
- filterData(justify, tempTextarea);
- var comment = tempTextarea.value;
-
//word count limit
var wordLimit = ${criteriaRatings.ratingCriteria.commentsMinWordsLimit};
if (wordLimit != 0) {
- var value = $("#justify").val();
- value = value.trim();
-
- var wordCount = value ? (value.replace(/['";:,.?\-!]+/g, '').match(/\S+/g) || []).length : 0;
+ var justify = document.getElementById("justify"),
+ value = $("#justify").val().trim(),
+ wordCount = value ? (value.replace(/['";:,.?\-!]+/g, '').match(/\S+/g) || []).length : 0;
if(wordCount < wordLimit){
var alertMessage = '';
@@ -67,7 +58,6 @@
}
}
- justify.value = comment;
return true;
}