Ticket #2218: 2218.patch

_whatsnew.html

@@ -95 +95 @@
                         pressing backspace may merge a hyperlink on the previous line with the text on the current line.</li> 
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1691">#1691</a>] Creation of links in Safari
                         failed if there was no selection.</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2218">#2218</a>] Improved Gecko based browser
+                        detection to accept Epiphany/Gecko as well.</li>
         </ul>
         <h3>
                 Version 2.6</h3>

editor/_source/internals/fckbrowserinfo.js

@@ -28 +28 @@
         IsIE            : /*@cc_on!@*/false,
         IsIE7           : /*@cc_on!@*/false && ( parseInt( s.match( /msie (\d+)/ )[1], 10 ) >= 7 ),
         IsIE6           : /*@cc_on!@*/false && ( parseInt( s.match( /msie (\d+)/ )[1], 10 ) >= 6 ),
-        IsGecko         : s.Contains('gecko/'),
+        IsGecko         : s.match( /mozilla\/5.0 \((?:[0-9a-z_:.\- ]+;){4} (rv:[0-9a-z.]+)\) gecko/ ) || s.match( /gecko\/(\d+)/ ),
         IsSafari        : s.Contains(' applewebkit/'),          // Read "IsWebKit"
         IsOpera         : !!window.opera,
         IsAIR           : s.Contains(' adobeair/'),
@@ -42 +42 @@
 
         if ( browserInfo.IsGecko )
         {
-                var geckoVersion = s.match( /gecko\/(\d+)/ )[1] ;
+                var geckoVersion = browserInfo.IsGecko[1] ;
+                var geckoRevision = geckoVersion.Contains( ':' ) && geckoVersion ;
 
                 // Actually "10" refers to Gecko versions before Firefox 1.5, when
                 // Gecko 1.8 (build 20051111) has been released.
@@ -51 +52 @@
                 // than 20051111, so we must also check for the revision number not to
                 // be 1.7 (we are assuming that rv < 1.7 will not have build > 20051111).
 
-                // TODO: Future versions may consider the rv number only, but it is
-                // still to check that all Gecko based browser present the rv number.
-                browserInfo.IsGecko10 = ( ( geckoVersion < 20051111 ) || ( /rv:1\.7/.test(s) ) ) ;
-                browserInfo.IsGecko19 = /rv:1\.9/.test(s) ;
+                if ( geckoRevision )
+                {
+                        browserInfo.IsGecko10 = /1\.7/.test( geckoRevision ) ;
+                        browserInfo.IsGecko19 = /1\.9/.test( geckoRevision ) ;
+                }
+                else
+                        browserInfo.IsGecko10 = geckoVersion < 20051111 ;
         }
         else
                 browserInfo.IsGecko10 = false ;
+
+        browserInfo.IsGecko = !!browserInfo.IsGecko ;
 })(FCKBrowserInfo) ;