Index: lams_tool_assessment/web/pages/authoring/parts/addmatchingpairs.jsp
===================================================================
diff -u -rd936378340b340295933bc76889b536a89b4f755 -r256ea3fdd5d39c1713ddab2bd30d53e6fb240c38
--- lams_tool_assessment/web/pages/authoring/parts/addmatchingpairs.jsp	(.../addmatchingpairs.jsp)	(revision d936378340b340295933bc76889b536a89b4f755)
+++ lams_tool_assessment/web/pages/authoring/parts/addmatchingpairs.jsp	(.../addmatchingpairs.jsp)	(revision 256ea3fdd5d39c1713ddab2bd30d53e6fb240c38)
@@ -42,10 +42,10 @@
 		    			},
 		    			fake: {
 		    				required: function(element) {
-				    			$("[name^=optionQuestion]").each(function() {
+				    			$("textarea[name^=optionQuestion]").each(function() {
 									this.value = CKEDITOR.instances[this.name].getData();
 				    			});		    				
-		    		        	return $("input[name^=optionQuestion]:filled").length < 1;
+		    		        	return $("textarea[name^=optionQuestion]:filled").length < 1;
 			    		    }
 	    			    }
 		    		},
Index: lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp
===================================================================
diff -u -rd936378340b340295933bc76889b536a89b4f755 -r256ea3fdd5d39c1713ddab2bd30d53e6fb240c38
--- lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp	(.../addmultiplechoice.jsp)	(revision d936378340b340295933bc76889b536a89b4f755)
+++ lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp	(.../addmultiplechoice.jsp)	(revision 256ea3fdd5d39c1713ddab2bd30d53e6fb240c38)
@@ -42,16 +42,18 @@
 		    			},
 		    			hasOptionFilled: {
 		    				required: function(element) {
-				    			$("[name^=optionString]").each(function() {
-									this.value = CKEDITOR.instances[this.name].getData();
-				    			});		    				
-		    		        	return $("input[name^=optionString]:filled").length < 1;
+				    			prepareOptionEditorsForAjaxSubmit();
+		    		        	return $("textarea[name^=optionString]:filled").length < 1;
 			    		    }			    		    
 	    			    },
 	    			    hasOneHundredGrade: {
 		    				required: function(element) {
-	    			    		return ($("select[name^='optionGrade'][value='1.0']").length < 1) && !eval($("#multipleAnswersAllowed").val());
-			    		    }			    		    
+		    					var hasOneHundredGrade = false;
+		    					$("select[name^='optionGrade']").each(function() {
+		    						hasOneHundredGrade = hasOneHundredGrade || (this.value == '1.0');
+		    					});
+	    			    		return !hasOneHundredGrade && !eval($("#multipleAnswersAllowed").val());
+			    		    }		    		    
 	    			    }
 		    		},
 		    		messages: {
@@ -86,9 +88,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/addnumerical.jsp
===================================================================
diff -u -rd936378340b340295933bc76889b536a89b4f755 -r256ea3fdd5d39c1713ddab2bd30d53e6fb240c38
--- lams_tool_assessment/web/pages/authoring/parts/addnumerical.jsp	(.../addnumerical.jsp)	(revision d936378340b340295933bc76889b536a89b4f755)
+++ lams_tool_assessment/web/pages/authoring/parts/addnumerical.jsp	(.../addnumerical.jsp)	(revision 256ea3fdd5d39c1713ddab2bd30d53e6fb240c38)
@@ -61,7 +61,11 @@
 	    			    },
 	    			    hasOneHundredGrade: {
 		    				required: function(element) {
-	    			    		return $("select[name^='optionGrade'][value='1.0']").length < 1;
+		    					var hasOneHundredGrade = false;
+		    					$("select[name^='optionGrade']").each(function() {
+		    						hasOneHundredGrade = hasOneHundredGrade || (this.value == '1.0');
+		    					});
+	    			    		return !hasOneHundredGrade;
 			    		    }			    		    
 	    			    },
 	    			    allAcceptedErrorsPositive: {
Index: lams_tool_assessment/web/pages/authoring/parts/addordering.jsp
===================================================================
diff -u -rd936378340b340295933bc76889b536a89b4f755 -r256ea3fdd5d39c1713ddab2bd30d53e6fb240c38
--- lams_tool_assessment/web/pages/authoring/parts/addordering.jsp	(.../addordering.jsp)	(revision d936378340b340295933bc76889b536a89b4f755)
+++ lams_tool_assessment/web/pages/authoring/parts/addordering.jsp	(.../addordering.jsp)	(revision 256ea3fdd5d39c1713ddab2bd30d53e6fb240c38)
@@ -42,10 +42,10 @@
 		    			},
 		    			hasOptionFilled: {
 		    				required: function(element) {
-				    			$("[name^=optionString]").each(function() {
+				    			$("textarea[name^=optionString]").each(function() {
 									this.value = CKEDITOR.instances[this.name].getData();
 				    			});		    				
-		    		        	return $("input[name^=optionString]:filled").length < 1;
+		    		        	return $("textarea[name^=optionString]:filled").length < 1;
 			    		    }			    		    
 	    			    }
 		    		},
Index: lams_tool_assessment/web/pages/authoring/parts/addshortanswer.jsp
===================================================================
diff -u -rd936378340b340295933bc76889b536a89b4f755 -r256ea3fdd5d39c1713ddab2bd30d53e6fb240c38
--- lams_tool_assessment/web/pages/authoring/parts/addshortanswer.jsp	(.../addshortanswer.jsp)	(revision d936378340b340295933bc76889b536a89b4f755)
+++ lams_tool_assessment/web/pages/authoring/parts/addshortanswer.jsp	(.../addshortanswer.jsp)	(revision 256ea3fdd5d39c1713ddab2bd30d53e6fb240c38)
@@ -47,7 +47,11 @@
 	    			    },
 	    			    hasOneHundredGrade: {
 		    				required: function(element) {
-	    			    		return $("select[name^='optionGrade'][value='1.0']").length < 1;
+		    					var hasOneHundredGrade = false;
+		    					$("select[name^='optionGrade']").each(function() {
+		    						hasOneHundredGrade = hasOneHundredGrade || (this.value == '1.0');
+		    					});
+	    			    		return !hasOneHundredGrade;
 			    		    }			    		    
 	    			    }
 		    		},