Index: lams_tool_assessment/web/pages/authoring/parts/addmatchingpairs.jsp
===================================================================
diff -u -r256ea3fdd5d39c1713ddab2bd30d53e6fb240c38 -r2bb752d583fa5a2d7432703b2b8bebae2adca615
--- lams_tool_assessment/web/pages/authoring/parts/addmatchingpairs.jsp	(.../addmatchingpairs.jsp)	(revision 256ea3fdd5d39c1713ddab2bd30d53e6fb240c38)
+++ lams_tool_assessment/web/pages/authoring/parts/addmatchingpairs.jsp	(.../addmatchingpairs.jsp)	(revision 2bb752d583fa5a2d7432703b2b8bebae2adca615)
@@ -42,9 +42,7 @@
 		    			},
 		    			fake: {
 		    				required: function(element) {
-				    			$("textarea[name^=optionQuestion]").each(function() {
-									this.value = CKEDITOR.instances[this.name].getData();
-				    			});		    				
+		    					prepareOptionEditorsForAjaxSubmit();	    				
 		    		        	return $("textarea[name^=optionQuestion]:filled").length < 1;
 			    		    }
 	    			    }
Index: lams_tool_assessment/web/pages/authoring/parts/addnumerical.jsp
===================================================================
diff -u -r256ea3fdd5d39c1713ddab2bd30d53e6fb240c38 -r2bb752d583fa5a2d7432703b2b8bebae2adca615
--- lams_tool_assessment/web/pages/authoring/parts/addnumerical.jsp	(.../addnumerical.jsp)	(revision 256ea3fdd5d39c1713ddab2bd30d53e6fb240c38)
+++ lams_tool_assessment/web/pages/authoring/parts/addnumerical.jsp	(.../addnumerical.jsp)	(revision 2bb752d583fa5a2d7432703b2b8bebae2adca615)
@@ -138,9 +138,7 @@
 		    		},
 		    		debug: true,
      			    submitHandler: function(form) {
-		    			$("[name^=optionFeedback]").each(function() {
-							this.value = CKEDITOR.instances[this.name].getData();
-		    			});
+     			    	prepareOptionEditorsForAjaxSubmit();
 		    			$("#optionList").val($("#optionForm").serialize(true));
 		    			$("#unitList").val($("#unitForm").serialize(true));
 		    			$("#question").val(CKEDITOR.instances.question.getData());
Index: lams_tool_assessment/web/pages/authoring/parts/addordering.jsp
===================================================================
diff -u -r256ea3fdd5d39c1713ddab2bd30d53e6fb240c38 -r2bb752d583fa5a2d7432703b2b8bebae2adca615
--- lams_tool_assessment/web/pages/authoring/parts/addordering.jsp	(.../addordering.jsp)	(revision 256ea3fdd5d39c1713ddab2bd30d53e6fb240c38)
+++ lams_tool_assessment/web/pages/authoring/parts/addordering.jsp	(.../addordering.jsp)	(revision 2bb752d583fa5a2d7432703b2b8bebae2adca615)
@@ -42,9 +42,7 @@
 		    			},
 		    			hasOptionFilled: {
 		    				required: function(element) {
-				    			$("textarea[name^=optionString]").each(function() {
-									this.value = CKEDITOR.instances[this.name].getData();
-				    			});		    				
+		    					prepareOptionEditorsForAjaxSubmit();	    				
 		    		        	return $("textarea[name^=optionString]:filled").length < 1;
 			    		    }			    		    
 	    			    }
@@ -78,9 +76,7 @@
 		    		},
 		    		debug: true,
      			    submitHandler: function(form) {
-		    			$("[name^=optionString]").each(function() {
-							this.value = CKEDITOR.instances[this.name].getData();
-		    			});
+     			    	prepareOptionEditorsForAjaxSubmit();
 		    			$("#optionList").val($("#optionForm").serialize(true));
 		    			$("#question").val(CKEDITOR.instances.question.getData());
 		    			$("#generalFeedback").val(CKEDITOR.instances.generalFeedback.getData());
Index: lams_tool_assessment/web/pages/authoring/parts/addshortanswer.jsp
===================================================================
diff -u -r256ea3fdd5d39c1713ddab2bd30d53e6fb240c38 -r2bb752d583fa5a2d7432703b2b8bebae2adca615
--- lams_tool_assessment/web/pages/authoring/parts/addshortanswer.jsp	(.../addshortanswer.jsp)	(revision 256ea3fdd5d39c1713ddab2bd30d53e6fb240c38)
+++ lams_tool_assessment/web/pages/authoring/parts/addshortanswer.jsp	(.../addshortanswer.jsp)	(revision 2bb752d583fa5a2d7432703b2b8bebae2adca615)
@@ -87,9 +87,7 @@
 		    		},
 		    		debug: true,
      			    submitHandler: function(form) {
-		    			$("[name^=optionFeedback]").each(function() {
-							this.value = CKEDITOR.instances[this.name].getData();
-		    			});	     			    
+     			    	prepareOptionEditorsForAjaxSubmit();     			    
 		    			$("#optionList").val($("#optionForm").serialize(true));
 		    			$("#question").val(CKEDITOR.instances.question.getData());
 		    			$("#generalFeedback").val(CKEDITOR.instances.generalFeedback.getData());