Changeset 882

Timestamp:

2007-09-26 16:57:21 (14 months ago)

Author:

fredck

Message:

Officially enabling Opera 9.50 compatibility.
Using Hallvord's suggestion for Opera detection and Dean Edward's idea for proper IE detection (avoiding others spoofing... notably Opera) (see http://dean.edwards.name/weblog/2007/03/sniff/).

Location:

FCKeditor/trunk

Files:

• editor/fckeditor.html (modified) (1 diff)
• editor/_source/internals/fckbrowserinfo.js (modified) (1 diff)
• fckeditor.js (modified) (4 diffs)

FCKeditor/trunk/editor/fckeditor.html

@@ -48 +48 @@
 
 // Main editor scripts.
-var sSuffix = /msie/.test( navigator.userAgent.toLowerCase() ) ? 'ie' : 'gecko' ;
+var sSuffix = ( /*@cc_on!@*/false ) ? 'ie' : 'gecko' ;
 
 /* @Packager.RemoveLine

FCKeditor/trunk/editor/_source/internals/fckbrowserinfo.js

@@ -26 +26 @@
 var FCKBrowserInfo =
 {
-        IsIE            : s.Contains('msie'),
-        IsIE7           : s.Contains('msie 7'),
+        IsIE            : /*@cc_on!@*/false,
+        IsIE7           : /*@cc_on!@*/false && s.Contains('msie 7'),
         IsGecko         : s.Contains('gecko/'),
         IsSafari        : s.Contains(' applewebkit/'),          // Read "IsWebKit"
-        IsOpera         : s.Contains('opera'),
+        IsOpera         : !!window.opera,
         IsMac           : s.Contains('macintosh')
 } ;

FCKeditor/trunk/fckeditor.js

@@ -40 +40 @@
         this.EnableSafari       = false ;               // This is a temporary property, while Safari support is under development.
         this.EnableSafari       = true ;                // @Packager.RemoveLine
-        this.EnableOpera        = false ;               // This is a temporary property, while Opera support is under development.
-        this.EnableOpera        = true ;                // @Packager.RemoveLine
 
         this.Config                     = new Object() ;
@@ -157 +155 @@
 FCKeditor.prototype._IsCompatibleBrowser = function()
 {
-        return FCKeditor_IsCompatibleBrowser( this.EnableSafari, this.EnableOpera ) ;
+        return FCKeditor_IsCompatibleBrowser( this.EnableSafari ) ;
 }
 
@@ -190 +188 @@
 }
 
-function FCKeditor_IsCompatibleBrowser( enableSafari, enableOpera )
+function FCKeditor_IsCompatibleBrowser( enableSafari )
 {
         var sAgent = navigator.userAgent.toLowerCase() ;
 
         // Internet Explorer
-        if ( sAgent.indexOf("msie") != -1 && sAgent.indexOf("mac") == -1 && sAgent.indexOf("opera") == -1 )
+        if ( /*@cc_on!@*/false && sAgent.indexOf("mac") == -1 )
         {
                 var sBrowserVersion = navigator.appVersion.match(/MSIE (.\..)/)[1] ;
@@ -206 +204 @@
 
         // Opera
-        if ( enableOpera && sAgent.indexOf( 'opera' ) == 0 && parseInt( navigator.appVersion, 10 ) >= 9 )
+        if ( window.opera && window.opera.version && window.opera.version() >= 9.5 )
                         return true ;