X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Fa11yhelp%2Fdialogs%2Fa11yhelp.js;h=15bee48d4b00899a5b271b802acc3377f781d0f8;hb=fb481ba0a7d298e3e7b9034fcb9f2afdc6e8e796;hp=3348f931371f9495b476f20d11a095e82c7d8873;hpb=059b4c2fef02528bf1af189f7996e80652faddfb;p=ckeditor.git

diff --git a/_source/plugins/a11yhelp/dialogs/a11yhelp.js b/_source/plugins/a11yhelp/dialogs/a11yhelp.js
index 3348f93..15bee48 100644
--- a/_source/plugins/a11yhelp/dialogs/a11yhelp.js
+++ b/_source/plugins/a11yhelp/dialogs/a11yhelp.js
@@ -1,12 +1,12 @@
 /*
-Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 
 CKEDITOR.dialog.add( 'a11yHelp', function( editor )
 {
 	var lang = editor.lang.accessibilityHelp,
-		id = CKEDITOR.tools.getNextNumber();
+		id = CKEDITOR.tools.getNextId();
 
 	// CharCode <-> KeyChar.
 	var keyMap =
@@ -125,8 +125,8 @@ CKEDITOR.dialog.add( 'a11yHelp', function( editor )
 	// Create the help list directly from lang file entries.
 	function buildHelpContents()
 	{
-		var pageTpl = '<div class="cke_accessibility_legend" role="document" aria-labelledby="cke_' + id + '_arialbl" tabIndex="-1">%1</div>' +
-				'<span id="cke_' + id + '_arialbl" class="cke_voice_label">' + lang.contents + ' </span>',
+		var pageTpl = '<div class="cke_accessibility_legend" role="document" aria-labelledby="' + id + '_arialbl" tabIndex="-1">%1</div>' +
+				'<span id="' + id + '_arialbl" class="cke_voice_label">' + lang.contents + ' </span>',
 			sectionTpl = '<h1>%1</h1><dl>%2</dl>',
 			itemTpl = '<dt>%1</dt><dd>%2</dd>';
 
@@ -170,6 +170,7 @@ CKEDITOR.dialog.add( 'a11yHelp', function( editor )
 					{
 						type : 'html',
 						id : 'legends',
+						style : 'white-space:normal;',
 						focus : function() {},
 						html : buildHelpContents() +
 							'<style type="text/css">' +
@@ -181,6 +182,17 @@ CKEDITOR.dialog.add( 'a11yHelp', function( editor )
 								'overflow-y:auto;' +
 								'overflow-x:hidden;' +
 							'}' +
+							// Some adjustments are to be done for IE6 and Quirks to work "properly" (#5757)
+							'.cke_browser_quirks .cke_accessibility_legend,' +
+							'.cke_browser_ie6 .cke_accessibility_legend' +
+							'{' +
+								'height:390px' +
+							'}' +
+							// Override non-wrapping white-space rule in reset css.
+							'.cke_accessibility_legend *' +
+							'{' +
+								'white-space:normal;' +
+							'}' +
 							'.cke_accessibility_legend h1' +
 							'{' +
 								'font-size: 20px;' +
@@ -198,7 +210,6 @@ CKEDITOR.dialog.add( 'a11yHelp', function( editor )
 							'}' +
 							'.cke_accessibility_legend dd' +
 							'{' +
-								'white-space:normal;' +
 								'margin:10px' +
 							'}' +
 						'</style>'