[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /homework functionplotresponse.pm

[raeburn]

raeburn		Sun Apr  5 17:09:57 2015 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/homework	functionplotresponse.pm 
  Log:
  - For 2.11
    - Backport 1.109, 1.110
  
  
Index: loncom/homework/functionplotresponse.pm
diff -u loncom/homework/functionplotresponse.pm:1.105.2.1 loncom/homework/functionplotresponse.pm:1.105.2.2
--- loncom/homework/functionplotresponse.pm:1.105.2.1	Tue Mar 10 15:43:59 2015
+++ loncom/homework/functionplotresponse.pm	Sun Apr  5 17:09:57 2015
@@ -1,7 +1,7 @@
 # LearningOnline Network with CAPA
 # Functionplot responses
 #
-# $Id: functionplotresponse.pm,v 1.105.2.1 2015/03/10 15:43:59 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 @@
     } 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') {
@@ -73,7 +70,7 @@
             }
         }
     } 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') {