vanilla ckeditor-3.4b

[ckeditor.git] / _source / core / env.js

diff --git a/_source/core/env.js b/_source/core/env.js
index ec4dc7b..a0ae465 100644 (file)
--- a/_source/core/env.js
+++ b/_source/core/env.js
@@ -1,5 +1,5 @@
 /*\r
-Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.\r
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.\r
 For licensing, see LICENSE.html or http://ckeditor.com/license\r
 */\r
 \r
@@ -71,9 +71,18 @@ if ( !CKEDITOR.env )
 \r
                        quirks : ( document.compatMode == 'BackCompat' ),\r
 \r
+                       mobile : ( agent.indexOf( 'mobile' ) > -1 ),\r
+\r
                        isCustomDomain : function()\r
                        {\r
-                               return this.ie && document.domain != window.location.hostname;\r
+                               if ( !this.ie )\r
+                                       return false;\r
+\r
+                               var domain = document.domain,\r
+                                       hostname = window.location.hostname;\r
+\r
+                               return domain != hostname &&\r
+                                       domain != ( '[' + hostname + ']' );     // IPv6 IP support (#5434)\r
                        }\r
                };\r
 \r
@@ -176,12 +185,13 @@ if ( !CKEDITOR.env )
                 *     alert( "Your browser is pretty cool!" );\r
                 */\r
                env.isCompatible =\r
+                       !env.mobile && (\r
                        ( env.ie && version >= 6 ) ||\r
                        ( env.gecko && version >= 10801 ) ||\r
                        ( env.opera && version >= 9.5 ) ||\r
                        ( env.air && version >= 1 ) ||\r
                        ( env.webkit && version >= 522 ) ||\r
-                       false;\r
+                       false );\r
 \r
                // The CSS class to be appended on the main UI containers, making it\r
                // easy to apply browser specific styles to it.\r