Index: samigo-app/src/webapp/jsf/delivery/deliverAssessment.jsp
===================================================================
--- samigo-app/src/webapp/jsf/delivery/deliverAssessment.jsp	(revision 324726)
+++ samigo-app/src/webapp/jsf/delivery/deliverAssessment.jsp	(working copy)
@@ -64,9 +64,9 @@
           var node_list = document.getElementsByTagName('input');
           for (var i=0; i<node_list.length; i++) {
             var node = node_list[i];		
-            if (node.getAttribute('type') == 'hidden' && node.id.endsWith('forceRanking')){
+            if (node.getAttribute('type') === 'hidden' && node.id.endsWith('forceRanking')){
               var nodeIdParts = node.id.split(":");
-              if(nodeIdParts[4]==myIdParts[4] && node.value == 'true'){
+              if(nodeIdParts[4] === myIdParts[4] && node.value === 'true'){
                 //find the radio button table(s)
                 var tables = document.getElementsByTagName('table');
 
@@ -73,7 +73,7 @@
                 for(var i=0; i<tables.length; i++){
                   var mytable = tables[i];
                   var mytableParts = mytable.id.split(":");
-                  if(mytable.id.endsWith('matrixSurveyRadioTable') && mytableParts[4] == myIdParts[4]){
+                  if(mytable.id.endsWith('matrixSurveyRadioTable') && mytableParts[4] === myIdParts[4]){
                     //found the right table
                     break;
                   }
@@ -94,13 +94,12 @@
                   //alert(currentRadioButtonId);
                   var button=document.getElementById(currentRadioButtonId);
                   var buttonIdStr = String(button.id);
-                  if(button.getAttribute('type') == 'radio' && button.checked == true && buttonIdStr != myId){
-                    obj.checked = false;
+                  if(button.getAttribute('type') === 'radio' && button.checked === true && buttonIdStr !== myId){
                     alert("You are only allowed one selection per column, please try again.");
-                    return;
+                    return false;
                   }
                 }
-                return;
+                return true;
               }
             }
           }
Index: samigo-app/src/webapp/jsf/delivery/item/deliverMatrixChoicesSurvey.jsp
===================================================================
--- samigo-app/src/webapp/jsf/delivery/item/deliverMatrixChoicesSurvey.jsp	(revision 324726)
+++ samigo-app/src/webapp/jsf/delivery/item/deliverMatrixChoicesSurvey.jsp	(working copy)
@@ -72,7 +72,7 @@
        			value="#{matrixBean.responseId}"
        			disabled="#{delivery.actionString=='reviewAssessment'|| delivery.actionString=='gradeAssessment'}"
        			itemValue="#{matrixBean.answerSid[colIndex]}"
-       			onClick="javascript:whichradio(this);" />
+       			onClick="if( whichradio(this) !== true ) {return false;}" />
          </t:columns>
          </t:dataTable>
      <f:verbatim><br /></f:verbatim>