--- loncom/homework/functionplotresponse.pm	2024/06/30 20:15:19	1.105.2.4
+++ loncom/homework/functionplotresponse.pm	2015/03/09 16:22:59	1.108
@@ -1,7 +1,7 @@
 # LearningOnline Network with CAPA
 # Functionplot responses
 #
-# $Id: functionplotresponse.pm,v 1.105.2.4 2024/06/30 20:15:19 raeburn Exp $
+# $Id: functionplotresponse.pm,v 1.108 2015/03/09 16:22:59 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -56,8 +56,11 @@ sub useHTML5 {
     } elsif ($env{'browser.type'} eq 'safari') {
         if ($env{'browser.os'} eq 'mac') {
             my ($prefix,$version) = ($env{'browser.version'} =~ /^(\d*)(\d{3})\./); 
-            if ($version >= 536) {
-                return 1;
+            if ((!$env{'browser.mobile'}) || 
+                (($env{'browser.mobile'}) && length($prefix))) {
+                if ($version >= 536) {
+                    return 1;
+                }
             }
         }
     } elsif ($env{'browser.type'} eq 'mozilla') {
@@ -70,7 +73,7 @@ sub useHTML5 {
             }
         }
     } elsif ($env{'browser.type'} eq 'explorer') { 
-        if (($env{'browser.os'} eq 'win') && ($env{'browser.version'} >= 10)) {
+        if (($env{'browser.os'} eq 'win') && ($env{'browser.version'} == 10)) {
             return 1;
         }
     } elsif ($env{'browser.type'} eq 'opera') {
@@ -159,11 +162,9 @@ sub html5_geogebra_startcode {
     unless ($height) { $height=400; }
     my $code=&geogebra_internal_program();
     return (<<ENDSTARTCODE);
-<div class="LC_left_float" style="margin:0; width:100%;">
 <article class="geogebraweb" data-param-enableLabelDrags="false" data-param-enableShiftDragZoom="false" 
 data-param-width="$width" data-param-height="$height" data-param-id="ggbApplet$appid" 
-data-param-useBrowserForJS="true" data-param-ggbbase64="$code"></article>
-</div><div style="padding:0;clear:both;margin:0;border:0"></div>
+data-param-ggbbase64="$code"></article>
 ENDSTARTCODE
 }