--- loncom/homework/response.pm 2014/12/30 20:03:10 1.238
+++ loncom/homework/response.pm 2018/03/30 23:50:13 1.245
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# various response type definitons response definition
#
-# $Id: response.pm,v 1.238 2014/12/30 20:03:10 raeburn Exp $
+# $Id: response.pm,v 1.245 2018/03/30 23:50:13 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -181,7 +181,6 @@ sub setrandomnumber {
} else {
($rndmod,$rndmod2)=&Apache::lonnet::digest("$id1,$id2");
}
- $Apache::lonhomework::results{'resource.'.$id1.'.rawrndseed'}=$rndseed;
if ($rndseed =~/([,:])/) {
my $char=$1;
use integer;
@@ -198,7 +197,6 @@ sub setrandomnumber {
}
}
&Apache::lonxml::debug("randseed $rndmod $rndseed");
- $Apache::lonhomework::results{'resource.'.$id1.'.rndseed'}=$rndseed;
&Apache::lonnet::setup_random_from_rndseed($rndseed);
return '';
}
@@ -267,10 +265,15 @@ sub mandatory_part_meta {
}
sub meta_part_order {
+ my ($type) = @_;
if (@Apache::inputtags::partlist) {
my @parts=@Apache::inputtags::partlist;
- shift(@parts);
+ unless ($type eq 'library') {
+ shift(@parts);
+ }
return ''.join(',',@parts).''."\n";
+ } elsif ($type eq 'library') {
+ return ''."\n";
} else {
return '0'."\n";
}
@@ -515,6 +518,9 @@ sub end_customresponse {
&Apache::lonhomework::set_bubble_lines();
}
}
+ if ($target eq 'web') {
+ &setup_prior_tries_hash(\&format_prior_response_math);
+ }
pop(@Apache::lonxml::namespace);
pop(@Apache::response::custom_answer);
pop(@Apache::response::custom_answer_type);
@@ -577,63 +583,6 @@ sub start_mathresponse {
return $result;
}
-sub edit_mathresponse_button {
- my ($partid,$id)=@_;
- my $field = 'HWVAL_'.$partid.'_'.$id;
- my $btype = $env{'browser.type'};
- my $bversion = $env{'browser.version'};
- if (($btype eq 'explorer' && $bversion < 9) || ($btype eq 'safari' && $bversion < 3) ||
- ($btype eq 'mozilla' && $bversion < 3)) {
- # DragMath applet
- my $button=&mt('Edit Answer');
-# my $helplink=&Apache::loncommon::help_open_topic('Formula_Editor');
- my $iconpath=$Apache::lonnet::perlvar{'lonIconsURL'};
- return(<
-function LC_mathedit_${field} (LCtextline) {
- thenumber = LCtextline;
- var thedata = '';
- if (document.getElementById(LCtextline)) {
- thedata = document.getElementById(LCtextline).value;
- }
- newwin = window.open("/adm/dragmath/MaximaPopup.html","","width=565,height=400,resizable");
-}
-
-
-ENDFORMULABUTTON
-
- } else {
- # LON-CAPA math equation editor
- my $mathjaxjs;
- unless (lc(&Apache::lontexconvert::tex_engine()) eq 'mathjax') {
- $mathjaxjs = <<"MATHJAX_SCRIPT";
-var mathjaxscript = document.createElement("script");
- mathjaxscript.type = "text/javascript";
- mathjaxscript.src = "/adm/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML";
- document.body.appendChild(mathjaxscript);
-MATHJAX_SCRIPT
- }
- return(<
- var LCmathField = document.getElementById('${field}');
- LCmathField.className += ' math'; // note the space
- var LCMATH_started;
- if (typeof LCMATH_started === 'undefined') {
- $mathjaxjs
- LCMATH_started = true;
- var script = document.createElement("script");
- script.type = "text/javascript";
- script.src = "/adm/LC_math_editor/LC_math_editor.min.js";
- document.body.appendChild(script);
- window.addEventListener('load', function(e) {
- LCMATH.initEditors();
- }, false);
- }
-
-EQ_EDITOR_SCRIPT
- }
-}
-
sub end_mathresponse {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result;
@@ -688,15 +637,6 @@ sub end_mathresponse {
}
}
}
- if ($target eq 'web') {
- &setup_prior_tries_hash(\&format_prior_response_math);
- my $partid = $Apache::inputtags::part;
- my $id = $Apache::inputtags::response[-1];
- if (($Apache::inputtags::status['-1'] eq 'CAN_ANSWER')
- && (&Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffeditor') ne 'yes')) {
- $result.=&edit_mathresponse_button($partid,$id);
- }
- }
pop(@Apache::lonxml::namespace);
pop(@Apache::response::custom_answer);