--- loncom/homework/functionplotresponse.pm 2013/07/22 11:46:26 1.103 +++ loncom/homework/functionplotresponse.pm 2015/04/05 17:09:57 1.105.2.2 @@ -1,7 +1,7 @@ # LearningOnline Network with CAPA # Functionplot responses # -# $Id: functionplotresponse.pm,v 1.103 2013/07/22 11:46:26 raeburn Exp $ +# $Id: functionplotresponse.pm,v 1.105.2.2 2015/04/05 17:09:57 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -56,11 +56,8 @@ sub useHTML5 { } elsif ($env{'browser.type'} eq 'safari') { if ($env{'browser.os'} eq 'mac') { my ($prefix,$version) = ($env{'browser.version'} =~ /^(\d*)(\d{3})\./); - if ((!$env{'browser.mobile'}) || - (($env{'browser.mobile'}) && length($prefix))) { - if ($version >= 536) { - return 1; - } + if ($version >= 536) { + return 1; } } } elsif ($env{'browser.type'} eq 'mozilla') { @@ -76,6 +73,10 @@ sub useHTML5 { if (($env{'browser.os'} eq 'win') && ($env{'browser.version'} >= 10)) { return 1; } + } elsif ($env{'browser.type'} eq 'opera') { + if ($env{'browser.version'} >= 18) { + return 1; + } } return 0; } @@ -183,7 +184,7 @@ sub java_geogebra_default_parameters { - + @@ -912,7 +913,7 @@ sub start_functionplotrule { $result=&Apache::edit::tag_start($target,$token,'Function Plot Graph Rule'). &Apache::edit::text_arg('Index/Name:','index', $token,'10').' '. - &Apache::edit::select_arg(&mt('Function:'),'derivativeorder', + &Apache::edit::select_arg('Function:','derivativeorder', [['0','Function itself'], ['1','First derivative'], ['2','Second derivative'],