--- loncom/homework/chemresponse.pm 2014/08/20 18:02:08 1.94 +++ loncom/homework/chemresponse.pm 2021/04/07 22:16:03 1.100 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # chemical equation style response # -# $Id: chemresponse.pm,v 1.94 2014/08/20 18:02:08 raeburn Exp $ +# $Id: chemresponse.pm,v 1.100 2021/04/07 22:16:03 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -69,6 +69,53 @@ sub chem_standard_order { sub separate_jme_window { my ($smile_input,$jme_input,$molecule,$options,$shown_text)=@_; my $usejsme = 1; + if (($env{'request.course.id'}) && ($env{'request.state'} ne 'construct')) { + if (exists($env{'course.'.$env{'request.course.id'}.'.usejsme'})) { + if ($env{'course.'.$env{'request.course.id'}.'.usejsme'} eq '0') { + $usejsme = 0; + } + } else { + my %domdefs = &Apache::lonnet::get_domain_defaults($env{'course.'.$env{'request.course.id'}.'.domain'}); + if ($domdefs{'usejsme'} eq '0') { + $usejsme = 0; + } + } + } else { + my %domdefs = &Apache::lonnet::get_domain_defaults($env{'course.'.$env{'request.course.id'}.'.domain'}); + if ($domdefs{'usejsme'} eq '0') { + $usejsme = 0; + } + } + if ($usejsme) { + if ($env{'browser.type'} eq 'safari') { + unless ($env{'browser.mobile'}) { + if ($env{'browser.version'} < 534) { + $usejsme = 0; + } + } + } elsif ($env{'browser.type'} eq 'mozilla') { + if ($env{'browser.version'} < 5) { + $usejsme = 0; + } elsif ($env{'browser.info'} =~ /^firefox\-([\d\.]+)/) { + my $firefox = $1; + if ($firefox < 12) { + $usejsme = 0; + } + } + } elsif ($env{'browser.type'} eq 'explorer') { + if ($env{'browser.version'} < 7) { + $usejsme = 0; + } + } elsif ($env{'browser.type'} eq 'opera') { + if ($env{'browser.version'} < 15) { + $usejsme = 0; + } + } + } else { + if ($env{'browser.mobile'}) { + $usejsme = 1; + } + } my $linkstyle = 'display:none'; my $creditstyle = 'display:inline'; if ($env{'browser.type'} eq 'explorer') { @@ -152,7 +199,7 @@ RESIZEJS function jsmeOnLoad() { document.getElementById('JMErefresh').style.display="none"; document.getElementById('JMEcredits').style.display="inline"; - jsmeApplet = new JSApplet.JSME("jme", "420px", "330px"); + jsmeApplet = new JSApplet.JSME("jme", "420px", "330px", {"options" : "$options"}); document.JME = jsmeApplet; $molecule; document.getElementById('JMEbuttons').style.display="block"; @@ -583,37 +630,32 @@ sub end_organicstructure { return $result; } -sub edit_reaction_button { - my ($id,$field,$reaction)=@_; - my $id_es=&escape($id); - my $field_es=&escape($field); - my $reaction_es=&escape($reaction); - my $docopen=&Apache::lonhtmlcommon::javascript_docopen(); - my $iconpath=$Apache::lonnet::perlvar{'lonIconsURL'}; - my $display=&mt('Edit Answer'); - my $start_page = - &Apache::loncommon::start_page('LON-CAPA Reaction Editor',undef, - {'frameset' => 1, - 'js_ready' => 1, - 'add_entries' => { - 'rows' => "30%,*", - 'border' => "0",}},); - my $end_page = - &Apache::loncommon::end_page({'frameset' => 1, - 'js_ready' => 1}); - my $result=< -$display -EDITREACTION +JS_PREVIEW return $result; } @@ -640,11 +682,11 @@ sub start_reactionresponse { $safeeval); $result .=''. &Apache::edit::text_arg('Answer:','answer',$token,40); - $result .=&edit_reaction_button($id,&Apache::edit::html_element_name('answer'),$answer).''; + $result .= &reaction_preview(&Apache::edit::html_element_name('answer'), $answer).''; my $initial=&Apache::lonxml::get_param('initial',$parstack,$safeeval); $result.=''. &Apache::edit::text_arg('Initial Reaction:','initial',$token,40); - $result .=&edit_reaction_button($id,&Apache::edit::html_element_name('initial'),$initial).''; + $result .= &reaction_preview(&Apache::edit::html_element_name('initial'), $initial).''; $result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); } elsif ($target eq 'modified') { my $constructtag=&Apache::edit::get_new_args($token,$parstack, @@ -732,7 +774,7 @@ sub end_reactionresponse { if (($target eq 'web') && ($Apache::lonhomework::type ne 'exam') && ($status eq 'CAN_ANSWER')) { my $reaction=$Apache::lonhomework::history{"resource.$partid.$id.submission"}; if ($reaction eq '') { $reaction=&Apache::lonxml::get_param('initial',$parstack,$safeeval); } - $result.=&edit_reaction_button($id,"HWVAL_$id",$reaction); + $result .= &reaction_preview("HWVAL_$id", $reaction); } &Apache::response::end_response(); return $result;