Ticket #2218: 2218_2.patch
File 2218_2.patch, 2.7 KB (added by , 16 years ago) |
---|
-
_whatsnew.html
101 101 failed if there was no selection.</li> 102 102 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2188">#2188</a>] PreserveSessionOnFileBrowser 103 103 is now removed as it was made obsolete with 2.6.</li> 104 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2218">#2218</a>] Improved Gecko based browser 105 detection to accept Epiphany/Gecko as well.</li> 104 106 </ul> 105 107 <h3> 106 108 Version 2.6</h3> -
editor/_source/internals/fckbrowserinfo.js
28 28 IsIE : /*@cc_on!@*/false, 29 29 IsIE7 : /*@cc_on!@*/false && ( parseInt( s.match( /msie (\d+)/ )[1], 10 ) >= 7 ), 30 30 IsIE6 : /*@cc_on!@*/false && ( parseInt( s.match( /msie (\d+)/ )[1], 10 ) >= 6 ), 31 IsGecko : s.Contains('gecko/'),31 IsGecko : navigator.product == 'Gecko', 32 32 IsSafari : s.Contains(' applewebkit/'), // Read "IsWebKit" 33 33 IsOpera : !!window.opera, 34 34 IsAIR : s.Contains(' adobeair/'), … … 38 38 // Completes the browser info with further Gecko information. 39 39 (function( browserInfo ) 40 40 { 41 browserInfo.IsGecko = browserInfo.IsGecko && !browserInfo.IsSafari && !browserInfo.IsOpera ; 41 42 browserInfo.IsGeckoLike = ( browserInfo.IsGecko || browserInfo.IsSafari || browserInfo.IsOpera ) ; 42 43 43 44 if ( browserInfo.IsGecko ) 44 45 { 45 var geckoVersion = s.match( /gecko\/(\d+)/ )[1] ; 46 var geckoMatch = s.match( /\((?:[0-9a-z_:.\- ]+;){4} (rv:[0-9a-z.]+)\) gecko/ ) || s.match( /gecko\/(\d+)/ ) ; 47 var geckoVersion = geckoMatch[1] ; 48 var geckoRevision = geckoVersion.Contains( ':' ) && geckoVersion ; 46 49 47 50 // Actually "10" refers to Gecko versions before Firefox 1.5, when 48 51 // Gecko 1.8 (build 20051111) has been released. … … 51 54 // than 20051111, so we must also check for the revision number not to 52 55 // be 1.7 (we are assuming that rv < 1.7 will not have build > 20051111). 53 56 54 // TODO: Future versions may consider the rv number only, but it is 55 // still to check that all Gecko based browser present the rv number. 56 browserInfo.IsGecko10 = ( ( geckoVersion < 20051111 ) || ( /rv:1\.7/.test(s) ) ) ; 57 browserInfo.IsGecko19 = /rv:1\.9/.test(s) ; 57 if ( geckoRevision ) 58 { 59 browserInfo.IsGecko10 = /1\.7/.test( geckoRevision ) ; 60 browserInfo.IsGecko19 = /1\.9/.test( geckoRevision ) ; 61 } 62 else 63 browserInfo.IsGecko10 = geckoVersion < 20051111 ; 58 64 } 59 65 else 60 66 browserInfo.IsGecko10 = false ;