[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /homework structuretags.pm

[raeburn]

raeburn		Wed Oct 23 22:30:28 2019 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/homework	structuretags.pm 
  Log:
  - For 2.11
    - Backport 1.563
  
  
Index: loncom/homework/structuretags.pm
diff -u loncom/homework/structuretags.pm:1.512.2.17 loncom/homework/structuretags.pm:1.512.2.18
--- loncom/homework/structuretags.pm:1.512.2.17	Wed Aug  7 21:44:28 2019
+++ loncom/homework/structuretags.pm	Wed Oct 23 22:30:28 2019
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.512.2.17 2019/08/07 21:44:28 raeburn Exp $
+# $Id: structuretags.pm,v 1.512.2.18 2019/10/23 22:30:28 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -342,12 +342,12 @@
                 submithandled = 1;
                 \$( "#msg_"+buttonId ).css({"display": "inline","background-color": "#87cefa",
                                            "color": "black","padding": "2px"}) ;
-                if (( \$(this.form).id == "LC_page" ) && (\$('input[name="all_submit"]').length )) {
+                if (( \$(this.form).attr("id") == "LC_page" ) && (\$('input[name="all_submit"]').length )) {
                     if (buttonId != "all_submit") {
                         \$( ".LC_status_"+buttonId ).hide();
-                        if (( "#"+buttonId+"_pressed" ).length) {
-                            \$( "#"+buttonId+"_pressed" ).val( "1" );
-                        }
+                    }
+                    if (( "#"+buttonId+"_pressed" ).length) {
+                        \$( "#"+buttonId+"_pressed" ).val( "1" );
                     }
                 } else {
                     \$( ".LC_status_"+buttonId ).hide();
@@ -360,11 +360,9 @@
                 if (timeout > 0) {
                     setTimeout(function(){
                                        \$( "#msg_"+buttonId ).css({"display": "none"});
-                                       if (( \$(this.form).id == "LC_page" ) && (\$('input[name="all_submit"]').length )) {
-                                           if (buttonId != "all_submit") {
-                                               if (( "#"+buttonId+"_pressed" ).length) {
-                                                   \$( "#"+buttonId+"_pressed" ).val( "" );
-                                               }
+                                       if (( \$(this.form).attr("id") == "LC_page" ) && (\$('input[name="all_submit"]').length )) {
+                                           if (( "#"+buttonId+"_pressed" ).length) {
+                                               \$( "#"+buttonId+"_pressed" ).val( "" );
                                            }
                                        }
                                        \$( ".LC_hwk_submit" ).prop( "disabled", false);