--- loncom/homework/structuretags.pm	2023/09/07 20:47:14	1.512.2.24.2.5
+++ loncom/homework/structuretags.pm	2023/12/29 23:47:02	1.512.2.24.2.7
@@ -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.24.2.5 2023/09/07 20:47:14 raeburn Exp $
+# $Id: structuretags.pm,v 1.512.2.24.2.7 2023/12/29 23:47:02 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -273,7 +273,7 @@ sub homework_js {
     }
     return &Apache::loncommon::resize_textarea_js().
            &Apache::loncommon::colorfuleditor_js().
-           &setmode_javascript().
+           &Apache::lonxml::setmode_javascript().
 	<<"JS";
 <script type="text/javascript">
 // <![CDATA[
@@ -385,21 +385,6 @@ var postsubmit = '$postsubmit';
 JS
 }
 
-sub setmode_javascript {
-    return <<"ENDSCRIPT";
-<script type="text/javascript">
-// <![CDATA[
-function setmode(form,probmode) {
-    var initial = form.problemmode.value;
-    form.problemmode.value = probmode;
-    form.submit();
-    form.problemmode.value = initial;
-}
-// ]]>
-</script>
-ENDSCRIPT
-}
-
 sub page_start {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$name,
 	$extra_head)=@_;
@@ -2246,7 +2231,8 @@ ENDJS
     # computation:
     #
     if ($target eq 'web') {
-        $result .= &Apache::lonhtmlcommon::set_compute_end_time();
+        $result .= &Apache::lonhtmlcommon::dash_to_minus_js().
+                   &Apache::lonhtmlcommon::set_compute_end_time();
         #
         # Closing tags delayed so any <script></script> tags 
         # not in head can appear inside body, for valid xhtml.