--- loncom/homework/chemresponse.pm 2014/08/20 18:02:08 1.94
+++ loncom/homework/chemresponse.pm 2017/01/04 20:09:08 1.99
@@ -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.99 2017/01/04 20:09:08 damieng 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') {
@@ -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=<<EDITREACTION;
+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;
+<input type="button" value="Help" onclick = "window.open('/adm/reactionresponse/reaction_help.html','','scrollbars=yes,resizable=yes,width=550,height=600')" />
<script type="text/javascript">
-// <!--
- function create_reaction_window_${id}_${field} () {
- editor=window.open('','','width=500,height=270,scrollbars=no,resizable=yes');
- editor.$docopen;
- editor.document.writeln('$start_page <frame src="/res/adm/pages/reactionresponse/reaction_viewer.html?inhibitmenu=yes" name="viewer" scrolling="no" /> <frame src="/res/adm/pages/reactionresponse/reaction_editor.html?inhibitmenu=yes&reaction=$reaction_es&id=$id_es&field=$field_es" name="editor" scrolling="no" /> $end_page');
- editor.document.close();
- }
-// -->
+ if (typeof reaction_preview_started === 'undefined') {
+ var script = document.createElement('script');
+ script.type = 'text/javascript';
+ script.src = '/adm/reactionresponse/reaction_preview.js';
+ document.body.appendChild(script);
+ reaction_preview_started = true;
+ }
+ window.addEventListener('load', function(e) {
+ var input = document.forms.lonhomework.$field;
+ input.readonly = '';
+ input.value = "$reaction";
+ if (!input.id)
+ input.id = "$field";
+ var preview = new LC.HW.ReactionPreview(input.id);
+ preview.start_preview();
+ }, false);
</script>
-<a href="javascript:create_reaction_window_${id}_${field}();void(0);"><img class="stift" src='$iconpath/stift.gif' alt='$display' title='$display' /></a>
-EDITREACTION
+JS_PREVIEW
return $result;
}
@@ -640,11 +682,11 @@ sub start_reactionresponse {
$safeeval);
$result .='<span class="LC_nobreak">'.
&Apache::edit::text_arg('Answer:','answer',$token,40);
- $result .=&edit_reaction_button($id,&Apache::edit::html_element_name('answer'),$answer).'</span>';
+ $result .= &reaction_preview(&Apache::edit::html_element_name('answer'), $answer).'</span>';
my $initial=&Apache::lonxml::get_param('initial',$parstack,$safeeval);
$result.='<span class="LC_nobreak">'.
&Apache::edit::text_arg('Initial Reaction:','initial',$token,40);
- $result .=&edit_reaction_button($id,&Apache::edit::html_element_name('initial'),$initial).'</span>';
+ $result .= &reaction_preview(&Apache::edit::html_element_name('initial'), $initial).'</span>';
$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;