vanilla ckeditor-3.6.3

[ckeditor.git] / _source / plugins / a11yhelp / dialogs / a11yhelp.js

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