Index: lams_tool_assessment/web/includes/javascript/assessmentoption.js
===================================================================
diff -u -r4c539129df9d6fd79ac3d7ba4d964dc8f0e6a9d6 -r988d9fce322beaf579b828d5694f2260bbc17b51
--- lams_tool_assessment/web/includes/javascript/assessmentoption.js	(.../assessmentoption.js)	(revision 4c539129df9d6fd79ac3d7ba4d964dc8f0e6a9d6)
+++ lams_tool_assessment/web/includes/javascript/assessmentoption.js	(.../assessmentoption.js)	(revision 988d9fce322beaf579b828d5694f2260bbc17b51)
@@ -7,22 +7,27 @@
 	//    var addOptionUrl = "<c:url value='/authoring/newOption.do'/>";
 	function addOption(){
 		var url= addOptionUrl;
-		var optionList = $("#optionForm").serialize(true);
+		var contentFolderID= $("#contentFolderID").val();
 		prepareFCKEditorsForAjaxSubmit();
+		var optionList = $("#optionForm").serialize(true);
 		$(optionTargetDiv).load(
 			url,
 			{
+				contentFolderID: contentFolderID,
 				questionType: questionType,
 				optionList: optionList 
 			}
 		);
 	}
 	function removeOption(idx){
  		var url= removeOptionUrl;
+		var contentFolderID= $("#contentFolderID").val();
+		prepareFCKEditorsForAjaxSubmit();
  		var optionList = $("#optionForm").serialize(true);
 		$(optionTargetDiv).load(
 				url,
 				{
+					contentFolderID: contentFolderID,					
 					questionType: questionType,
 					optionIndex: idx,
 					optionList: optionList 
@@ -31,10 +36,13 @@
 	}
 	function upOption(idx){
  		var url= upOptionUrl;
+		var contentFolderID= $("#contentFolderID").val();
+ 		prepareFCKEditorsForAjaxSubmit();
  		var optionList = $("#optionForm").serialize(true);
 		$(optionTargetDiv).load(
 				url,
 				{
+					contentFolderID: contentFolderID,					
 					questionType: questionType,
 					optionIndex: idx,
 					optionList: optionList 
@@ -43,20 +51,30 @@
 	}
 	function downOption(idx){
  		var url= downOptionUrl;
+		var contentFolderID= $("#contentFolderID").val(); 	
+ 		prepareFCKEditorsForAjaxSubmit();
  		var optionList = $("#optionForm").serialize(true);
 		$(optionTargetDiv).load(
 				url,
 				{
+					contentFolderID: contentFolderID,					
 					questionType: questionType,
 					optionIndex: idx,
 					optionList: optionList 
 				}
 		);
 	}
 	function prepareFCKEditorsForAjaxSubmit(){
-		//$("input[id^=optionFeedback]").each(function() {
-		//	this.val(FCKeditorAPI.GetInstance($(this).id).GetXHTML());
-		//});
+		if ((questionType == 1) || (questionType == 3) || (questionType == 4)) {
+			$("[name^=optionFeedback]").each(function() {
+				this.value = FCKeditorAPI.GetInstance(this.name).GetXHTML();
+			});
+		}
+		if (questionType == 2) {
+			$("[name^=optionQuestion]").each(function() {
+				this.value = FCKeditorAPI.GetInstance(this.name).GetXHTML();
+			});
+		}
 	}