--- loncom/homework/chemresponse.pm 2014/08/20 18:02:08 1.94 +++ loncom/homework/chemresponse.pm 2021/12/24 11:07:42 1.101 @@ -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.101 2021/12/24 11:07:42 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"; @@ -591,24 +638,24 @@ sub edit_reaction_button { 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 $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=< // @@ -617,6 +664,35 @@ EDITREACTION return $result; } +sub reaction_preview { + my ($field, $reaction) = @_; + + # NOTE: $reaction should be encoded if the document was sent as XHTML + $reaction =~ s/"//g; + my $result=< + +JS_PREVIEW + return $result; +} + sub start_reactionresponse { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result; @@ -640,11 +716,20 @@ 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).''; + my $inline_chem = &use_inline_chem(); + if ($inline_chem) { + $result .= &reaction_preview(&Apache::edit::html_element_name('answer'), $answer).''; + } else { + $result .=&edit_reaction_button($id,&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).''; + if ($inline_chem) { + $result .= &reaction_preview(&Apache::edit::html_element_name('initial'), $initial).''; + } else { + $result .=&edit_reaction_button($id,&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,12 +817,38 @@ 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); + if (&use_inline_chem()) { + $result .= &reaction_preview("HWVAL_$id", $reaction); + } else { + $result.=&edit_reaction_button($id,"HWVAL_$id",$reaction); + } } &Apache::response::end_response(); return $result; } +sub use_inline_chem { + my $inline_chem = 1; + if (($env{'request.course.id'}) && ($env{'request.state'} ne 'construct')) { + if (exists($env{'course.'.$env{'request.course.id'}.'.inline_chem'})) { + if ($env{'course.'.$env{'request.course.id'}.'.inline_chem'} eq '0') { + $inline_chem = 0; + } + } else { + my %domdefs = &Apache::lonnet::get_domain_defaults($env{'course.'.$env{'request.course.id'}.'.domain'}); + if ($domdefs{'inline_chem'} eq '0') { + $inline_chem = 0; + } + } + } else { + my %domdefs = &Apache::lonnet::get_domain_defaults($env{'course.'.$env{'request.course.id'}.'.domain'}); + if ($domdefs{'inline_chem'} eq '0') { + $inline_chem = 0; + } + } + return $inline_chem; +} + sub format_prior_response_reaction { my ($mode,$answer) =@_; return ''.