Ticket #2218: 2218_3.patch
File 2218_3.patch, 2.5 KB (added by , 15 years ago) |
---|
-
_whatsnew.html
116 116 changed from "<?=" to "<? echo".</li> 117 117 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2254">#2254</a>] Minor fix in fckselection for 118 118 nodeName attribute detection.</li> 119 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2218">#2218</a>] Improved Gecko based browser 120 detection to accept Epiphany/Gecko as well.</li> 119 121 </ul> 120 122 <h3> 121 123 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( /rv:(\d+\.\d+)/ ) ; 47 var geckoVersion = geckoMatch && parseFloat( geckoMatch[1] ) ; 46 48 47 49 // Actually "10" refers to Gecko versions before Firefox 1.5, when 48 50 // Gecko 1.8 (build 20051111) has been released. … … 51 53 // than 20051111, so we must also check for the revision number not to 52 54 // be 1.7 (we are assuming that rv < 1.7 will not have build > 20051111). 53 55 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) ; 56 if ( geckoVersion ) 57 { 58 browserInfo.IsGecko10 = ( geckoVersion < 1.8 ) ; 59 browserInfo.IsGecko19 = ( geckoVersion > 1.8 ) ; 60 } 58 61 } 59 else60 browserInfo.IsGecko10 = false ;61 62 })(FCKBrowserInfo) ;