Changeset 2133 for FCKeditor.Java/trunk

Timestamp:

2008-06-25 09:17:42 (5 months ago)

Author:

th-schwarz

Message:

- solved ticked #2295
- cleaned up compatibility code

Location:

FCKeditor.Java/trunk/java-core/src

Files:

• main/java/net/fckeditor/tool/Compatibility.java (modified) (2 diffs)
• test/java/net/fckeditor/tool/CompatibilityTest.java (modified) (2 diffs)

FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/tool/Compatibility.java

@@ -35 +35 @@
         /**
          * Checks if a browser's user agent string is compatible for the FCKeditor.
-         * <br />
-         * Adapted from:
-         * http://dev.fckeditor.net/browser/FCKeditor/releases/stable/fckeditor.php
          * 
-         * @param userAgentString
+         * @param userAgentStr
          * @return <code>true</code> if compatible otherwise <code>false</code>
          */
@@ -45 +42 @@
                 if (Utils.isEmpty(userAgentString))
                         return false;
-
-                float version;
+                
+                String userAgentStr = userAgentString.toLowerCase();
 
                 // IE 5.5+, check special keys like 'Opera' and 'mac', because there are some
                 // other browsers, containing 'MSIE' in there agent string!
-                if (userAgentString.indexOf("Opera") < 0 && userAgentString.indexOf("mac") < 0) {
-                        version = getBrowserVersion(userAgentString, ".*MSIE ([\\d]+.[\\d]+).*");
-                        if (version != -1f && version >= 5.5f)
+                if (userAgentStr.indexOf("opera") < 0 && userAgentStr.indexOf("mac") < 0) {
+                        if (getBrowserVersion(userAgentStr, ".*msie ([\\d]+.[\\d]+).*") >= 5.5f)
                                 return true;
                 }
-
-                // for mozilla only, because all firefox versions are supported
-                version = getBrowserVersion(userAgentString, ".*Gecko/([\\d]+).*");
-                if (version != -1f && version >= 20030210f)
+                
+                // for all gecko based browsers
+                if (getBrowserVersion(userAgentStr, ".*rv:([\\d]+.[\\d]+).*") > 1.7f)
                         return true;
-
+                
                 // Opera 9.5+
-                version = getBrowserVersion(userAgentString, "Opera/([\\d]+.[\\d]+).*");
-                if (version != -1f && version >= 9.5f)
-                        return true;
-                version = getBrowserVersion(userAgentString, ".*Opera ([\\d]+.[\\d]+)");
-                if (version != -1f && version >= 9.5f)
+                if (getBrowserVersion(userAgentStr, "opera/([\\d]+.[\\d]+).*") >= 9.5f
+                                || getBrowserVersion(userAgentStr, ".*opera ([\\d]+.[\\d]+)") >= 9.5f)
                         return true;
 
                 // Safari 3+
-                version = getBrowserVersion(userAgentString, ".*AppleWebKit/([\\d]+).*");
-                if (version != -1f && version >= 522f)
+                if (getBrowserVersion(userAgentStr, ".*applewebkit/([\\d]+).*") >= 522f)
                         return true;
 

FCKeditor.Java/trunk/java-core/src/test/java/net/fckeditor/tool/CompatibilityTest.java

@@ -86 +86 @@
             assertTrue(Compatibility.check("Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en-US; rv:1.8.1.12) Gecko/20080201 Firefox/2.0.0.12"));
     }
+        
+        @Test
+        public void testFirefox30Linux() throws Exception {
+                assertTrue(Compatibility.check("Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9pre) Gecko/2008040318 Firefox/3.0pre (Swiftfox)"));
+        }
 
         @Test
@@ -111 +116 @@
                 assertTrue(Compatibility.check("Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 6.0; en) Opera 9.50"));   
     }
+        
+        @Test
+        public void testEpaphany220Linux() throws Exception {
+                assertTrue(Compatibility.check("Mozilla/5.0 (X11; U; Linux i686; en; rv:1.9b3) Gecko Epiphany/2.20"));
+        }
 }