Changeset 2482

Timestamp:

09/20/08 13:20:26 (5 years ago)

Author:

fredck

Message:

Added the browser version to CKEDITOR.env.

File:

• CKEditor/branches/prototype/_source/core/env.js (modified) (2 diffs)

CKEditor/branches/prototype/_source/core/env.js

@@ -94 +94 @@
                 env.gecko = ( navigator.product == 'Gecko' && !env.webkit && !env.opera );
 
+                var version = 0;
+
+                // Internet Explorer 6.0+
+                if ( env.ie )
+                        version = parseFloat( agent.match( /msie (\d+)/ )[1] );
+
+                // Gecko.
+                if ( env.gecko )
+                {
+                        var geckoRelease = agent.match( /rv:([\d\.]+)/ );
+                        if ( geckoRelease )
+                        {
+                                geckoRelease = geckoRelease[1].split( '.' );
+                                version = geckoRelease[0] * 10000 + ( geckoRelease[1] || 0 ) * 100 + ( geckoRelease[2] || 0 );
+                        }
+                }
+
+                // Opera 9.50+
+                if ( env.opera )
+                        version = parseFloat( opera.version() );
+
+                // Adobe AIR 1.0+
+                // Checked before Safari because AIR have the WebKit rich text editor
+                // features from Safari 3.0.4, but the version reported is 420.
+                if ( env.air )
+                        version = parseFloat( agent.match( / adobeair\/(\d+)/ )[1] );
+
+                // WebKit 522+ (Safari 3+)
+                if ( env.webkit )
+                        version = parseFloat( agent.match( / applewebkit\/(\d+)/ )[1] );
+
+                /**
+                 * Contains the browser version.
+                 *
+                 * For gecko based browsers (like Firefox) it contains the revision
+                 * number with first three parts concatenated with a padding zero
+                 * (e.g. for revision 1.9.0.2 we have 10900).
+                 *
+                 * For webkit based browser (like Safari and Chrome) it contains the
+                 * WebKit build version (e.g. 522).
+                 * @name CKEDITOR.env.version
+                 * @type Boolean
+                 * @example
+                 * if ( CKEDITOR.env.ie && <b>CKEDITOR.env.version</b> <= 6 )
+                 *     alert( "Ouch!" );
+                 */
+                env.version = version;
+
                 /**
                  * Indicates that CKEditor is running on a compatible browser.
@@ -102 +150 @@
                  *     alert( "Your browser is pretty cool!" );
                  */
-                env.isCompatible = (function()
-                {
-                        // Internet Explorer 6.0+
-                        if ( env.ie )
-                                return ( agent.match( /msie (\d+)/ )[1] >= 6 );
-
-                        // Gecko.
-                        if ( env.gecko )
-                        {
-                                var geckoRelease = agent.match( /rv:([\d\.]+)/ );
-                                if ( !geckoRelease )
-                                        return false;
-                                geckoRelease = geckoRelease[1].split( '.' );
-                                geckoRelease = geckoRelease[0] * 10000 + ( geckoRelease[1] || 0 ) * 100 + ( geckoRelease[2] || 0 );
-                                return geckoRelease >= 10801;
-                        }
-
-                        // Opera 9.50+
-                        if ( env.opera )
-                                return parseFloat( opera.version() ) >= 9.5;
-
-                        // Adobe AIR 1.0+
-                        // Checked before Safari because AIR have the WebKit rich text editor
-                        // features from Safari 3.0.4, but the version reported is 420.
-                        if ( env.air )
-                                return ( agent.match( / adobeair\/(\d+)/ )[1] >= 1 );
-
-                        // WebKit 522+ (Safari 3+)
-                        if ( env.webkit )
-                                return ( agent.match( / applewebkit\/(\d+)/ )[1] >= 522 );
-
-                        return false;
-                })();
+                env.isCompatible =
+                        ( env.ie && version >= 6 ) ||
+                        ( env.gecko && version >= 10801 ) ||
+                        ( env.opera && version >= 9.5 ) ||
+                        ( env.air && version >= 1 ) ||
+                        ( env.webkit && version >= 522 ) ||
+                        false;
 
                 return env;