--- loncom/homework/structuretags.pm	2014/09/14 15:21:43	1.520
+++ loncom/homework/structuretags.pm	2014/09/15 17:45:35	1.521
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.520 2014/09/14 15:21:43 raeburn Exp $
+# $Id: structuretags.pm,v 1.521 2014/09/15 17:45:35 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -256,23 +256,42 @@ function image_response_click (which, e)
 }
 
 var submithandled = 0;
+var keypresshandled = 0;
 
 $(document).ready(function(){
+
+    $(document).keypress(function(event){
+        var keycode = (event.keyCode ? event.keyCode : event.which);
+        if ((keycode == '13') && (keypresshandled == 0)) {
+            if ( $( document.activeElement ).hasClass("LC_textline") ) {
+                keypresshandled = 1;
+                var idsArray = $( document.activeElement ).attr("id").split(/HWVAL_/);
+                if (idsArray.length) {
+                    event.preventDefault();
+                    var itemsArray = idsArray[1].split(/_/);
+                    var buttonId = idsArray[0]+'submit_'+itemsArray[0];
+                    $("#"+buttonId).trigger("click");
+                }
+            }
+        }
+    });
+
     $(document).delegate('form :submit', 'click', function( event ) {
         if ( $( this ).hasClass( "LC_hwk_submit" ) ) {
             var buttonId = this.id;
             if (submithandled == 0) {
                 submithandled = 1;
                 $( "#msg_"+buttonId ).css({"display": "inline","background-color": "#87cefa",
-                                          "color": "black","padding": "2px"}) ;
+                                           "color": "black","padding": "2px"}) ;
                 $( ".LC_status_"+buttonId ).hide();
-                if (( $(this.form).id == "LC_page" ) && ($('input[name="all_submit"]').length )) {             
+                if (( $(this.form).id == "LC_page" ) && ($('input[name="all_submit"]').length )) {
                     if (( "#"+buttonId+"_pressed" ).length) {
                         $( "#"+buttonId+"_pressed" ).val( "1" );
                     }
                 }
                 $(this.form).submit();
-                $( this ).attr( "disabled", true);
+                $( ".LC_hwk_submit" ).prop( "disabled", true);
+                $( ".LC_textline" ).prop( "readonly", "readonly");
                 event.preventDefault();
                 return true;
             }
@@ -280,6 +299,7 @@ $(document).ready(function(){
     });
 });
 
+
 // ]]>
 </script>
 JS