loncom/homework/chemresponse.pm - diff

Return to chemresponse.pm CVS log

Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/chemresponse.pm between versions 1.94 and 1.98

-version 1.94, 2014/08/20 18:02:08
+version 1.98, 2015/09/21 14:24:54
  Line 69  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') {
- Line 607  sub edit_reaction_button {
+ Line 654  sub edit_reaction_button {
      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.writeln('$start_page <frame src="/adm/reactionresponse/reaction_viewer.html?inhibitmenu=yes" name="viewer" scrolling="no" />  <frame src="/adm/reactionresponse/reaction_editor.html?inhibitmenu=yes&reaction=$reaction_es&id=$id_es&field=$field_es" name="editor" scrolling="no" /> $end_page');
  	editor.document.close();
      }
  // -->

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.94
changed lines
	Added in v.1.98