X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fcore%2F_bootstrap.js;h=7ed91debc5b51e1db604e8e35e9907fc5a9f50db;hb=3fe9cac293e090ea459a3ee10d78cbe9e1dd0e03;hp=9b9d081d4b85b9593fee3b53d4f915436d3a0236;hpb=c6e377a02b54abc07129d72b632763c727476a15;p=ckeditor.git

diff --git a/_source/core/_bootstrap.js b/_source/core/_bootstrap.js
index 9b9d081..7ed91de 100644
--- a/_source/core/_bootstrap.js
+++ b/_source/core/_bootstrap.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 
@@ -9,20 +9,17 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 
 (function()
 {
-	// Check is High Contrast is active by creating a temporary element with a
-	// background image.
-
-	var useSpacer = CKEDITOR.env.ie && CKEDITOR.env.version < 7,
-		useBlank = CKEDITOR.env.ie && CKEDITOR.env.version == 7;
-
-
-	var backgroundImageUrl = useSpacer ? ( CKEDITOR.basePath + 'images/spacer.gif' ) :
-							 useBlank ? 'about:blank' : 'data:image/png;base64,';
+	// Disable HC detaction in WebKit. (#5429)
+	if ( CKEDITOR.env.webkit )
+	{
+		CKEDITOR.env.hc = false;
+		return;
+	}
 
+	// Check whether high contrast is active by creating a colored border.
 	var hcDetect = CKEDITOR.dom.element.createFromHtml(
-		'<div style="width:0px;height:0px;' +
-			'position:absolute;left:-10000px;' +
-			'background-image:url(' + backgroundImageUrl + ')"></div>', CKEDITOR.document );
+		'<div style="width:0px;height:0px;position:absolute;left:-10000px;' +
+			'border: 1px solid;border-color: red blue;"></div>', CKEDITOR.document );
 
 	hcDetect.appendTo( CKEDITOR.document.getHead() );
 
@@ -30,12 +27,13 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 	// Catch exception needed sometimes for FF. (#4230)
 	try
 	{
-		CKEDITOR.env.hc = ( hcDetect.getComputedStyle( 'background-image' ) == 'none' );
+		CKEDITOR.env.hc = hcDetect.getComputedStyle( 'border-top-color' ) == hcDetect.getComputedStyle( 'border-right-color' );
 	}
 	catch (e)
 	{
 		CKEDITOR.env.hc = false;
 	}
+
 	if ( CKEDITOR.env.hc )
 		CKEDITOR.env.cssClass += ' cke_hc';
 
@@ -59,9 +57,7 @@ CKEDITOR.plugins.load( CKEDITOR.config.corePlugins.split( ',' ), function()
 		}
 	});
 
-/*
-TODO: Enable the following and check if effective.
-
+// Needed for IE6 to not request image (HTTP 200 or 304) for every CSS background. (#6187)
 if ( CKEDITOR.env.ie )
 {
 	// Remove IE mouse flickering on IE6 because of background images.
@@ -75,7 +71,14 @@ if ( CKEDITOR.env.ie )
 		// line. For safety, let's just ignore errors.
 	}
 }
-*/
+
+/**
+ * Indicates that CKEditor is running on a High Contrast environment.
+ * @name CKEDITOR.env.hc
+ * @example
+ * if ( CKEDITOR.env.hc )
+ *     alert( 'You're running on High Contrast mode. The editor interface will get adapted to provide you a better experience.' );
+ */
 
 /**
  * Fired when a CKEDITOR core object is fully loaded and ready for interaction.