Changeset 5061

Timestamp:

02/08/10 18:17:41 (3 years ago)

Author:

garry.yao

Message:

Lazy load the 'a11yhelp' plugin language entires.

Location:

CKEditor/branches/features/aria/_source

Files:

• lang/en.js (modified) (3 diffs)
• plugins/a11yhelp/lang (added)
• plugins/a11yhelp/lang/default.js (copied) (copied from CKEditor/branches/features/aria/_source/plugins/uicolor/lang/en.js) (1 diff)
• plugins/a11yhelp/plugin.js (modified) (1 diff)

CKEditor/branches/features/aria/_source/lang/en.js

@@ -592 +592 @@
                 label : 'Font',
                 voiceLabel : 'Font',
-                panelTitle : 'Font Name',
+                panelTitle : 'Font Name'
         },
 
@@ -599 +599 @@
                 label : 'Size',
                 voiceLabel : 'Font Size',
-                panelTitle : 'Font Size',
+                panelTitle : 'Font Size'
         },
 
@@ -705 +705 @@
 
         toolbarCollapse : 'Collapse Toolbar',
-        toolbarExpand : 'Expand Toolbar',
-
-        accessibilityHelp :
-        {
-                title : 'Accessibility Instructions',
-                legend :
-                [
-                        {
-                                name : 'General',
-                                items :
-                                                [
-                                                        {
-                                                                name : 'Editor Toolbar',
-                                                                legend: 'Press ALT + F10 to navigate to the toolbar; Move to next toolbar button with TAB or RIGHT ARROW; Move to previous button with  SHIFT+TAB or LEFT ARROW; Press SPACE or ENTER to trigger the toolbar button.'
-                                                        },
-
-                                                        {
-                                                                name : 'Editor Element Pathbar',
-                                                                legend : 'Press ALT + F10 to navigate to the elements pathbar; Move to next element button with TAB or RIGHT ARROW; Move to previous button with  SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor.'
-                                                        },
-
-                                                        {
-                                                                name : 'Editor Context Menu',
-                                                                legend : 'Press SHIFT + F10 or CTRL + SHIFT + F10 or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW; Move to previous option with  SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option.' +
-                                                                                 'Open sub-menu of current option wtih SPACE or ENTER or RIGHT ARROW; Go back to parent menu item with ESC or LEFT ARROW;' +
-                                                                                 'Close context menu with ESC.'
-                                                        },
-
-                                                        {
-                                                                name : 'Editor Dialog',
-                                                                legend : 'Inside a dialog, press TAB to navigate to next dialog field, press SHIFT + TAB to move to previous field, press ENTER to submit dialog, press ESC to cancel dialog.' +
-                                                                                 'For dialogs that have multiple tab pages, press ALT + F10 to navigate to tab-list. Then move to next tab with TAB OR RIGTH ARROW; Move to previous tab with SHIFT + TAB or LEFT ARROW. Press SPACE or ENTER to select the tab page.'
-                                                        },
-
-                                                        {
-                                                                name : 'Editor List Box',
-                                                                legend : 'Inside a list-box, move to next list item with TAB OR DOWN ARROW; Move to previous list item with SHIFT + TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box.'
-                                                        }
-                                                ]
-                        },
-                        {
-                                name : 'Commands',
-                                items :
-                                                [
-                                                        {
-                                                                name : ' Undo command',
-                                                                legend : 'Press CTRL + Z'
-                                                        },
-                                                        {
-                                                                name : ' Redo command',
-                                                                legend : 'Press CTRL + Y or CTRL + SHIFT + Y'
-                                                        },
-                                                        {
-                                                                name : ' Bold command',
-                                                                legend : 'Press CTRL + B'
-                                                        },
-                                                        {
-                                                                name : ' Italic command',
-                                                                legend : 'Press CTRL + I'
-                                                        },
-                                                        {
-                                                                name : ' Underline command',
-                                                                legend : 'Press CTRL + U'
-                                                        },
-                                                        {
-                                                                name : ' Link command',
-                                                                legend : 'Press CTRL + L'
-                                                        },
-                                                        {
-                                                                name : ' Toolbar Collapse command',
-                                                                legend : 'Press ALT + -'
-                                                        }
-                                                ]
-                        }
-                ]
-        }
+        toolbarExpand : 'Expand Toolbar'
 };

CKEditor/branches/features/aria/_source/plugins/a11yhelp/lang/default.js

@@ -4 +4 @@
 */
 
-CKEDITOR.plugins.setLang( 'uicolor', 'en',
+CKEDITOR.plugins.setLang( 'a11yhelp', 'en',
 {
-        uicolor :
+        accessibilityHelp :
         {
-                title : 'UI Color Picker',
-                preview : 'Live preview',
-                config : 'Paste this string into your config.js file',
-                predefined : 'Predefined color sets'
+                title : 'Accessibility Instructions',
+                legend :
+                [
+                        {
+                                name : 'General',
+                                items :
+                                                [
+                                                        {
+                                                                name : 'Editor Toolbar',
+                                                                legend: 'Press ALT + F10 to navigate to the toolbar; Move to next toolbar button with TAB or RIGHT ARROW; Move to previous button with  SHIFT+TAB or LEFT ARROW; Press SPACE or ENTER to trigger the toolbar button.'
+                                                        },
+
+                                                        {
+                                                                name : 'Editor Element Pathbar',
+                                                                legend : 'Press ALT + F10 to navigate to the elements pathbar; Move to next element button with TAB or RIGHT ARROW; Move to previous button with  SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor.'
+                                                        },
+
+                                                        {
+                                                                name : 'Editor Context Menu',
+                                                                legend : 'Press SHIFT + F10 or CTRL + SHIFT + F10 or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW; Move to previous option with  SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option.' +
+                                                                                 'Open sub-menu of current option wtih SPACE or ENTER or RIGHT ARROW; Go back to parent menu item with ESC or LEFT ARROW;' +
+                                                                                 'Close context menu with ESC.'
+                                                        },
+
+                                                        {
+                                                                name : 'Editor Dialog',
+                                                                legend : 'Inside a dialog, press TAB to navigate to next dialog field, press SHIFT + TAB to move to previous field, press ENTER to submit dialog, press ESC to cancel dialog.' +
+                                                                                 'For dialogs that have multiple tab pages, press ALT + F10 to navigate to tab-list. Then move to next tab with TAB OR RIGTH ARROW; Move to previous tab with SHIFT + TAB or LEFT ARROW. Press SPACE or ENTER to select the tab page.'
+                                                        },
+
+                                                        {
+                                                                name : 'Editor List Box',
+                                                                legend : 'Inside a list-box, move to next list item with TAB OR DOWN ARROW; Move to previous list item with SHIFT + TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box.'
+                                                        }
+                                                ]
+                        },
+                        {
+                                name : 'Commands',
+                                items :
+                                                [
+                                                        {
+                                                                name : ' Undo command',
+                                                                legend : 'Press CTRL + Z'
+                                                        },
+                                                        {
+                                                                name : ' Redo command',
+                                                                legend : 'Press CTRL + Y or CTRL + SHIFT + Y'
+                                                        },
+                                                        {
+                                                                name : ' Bold command',
+                                                                legend : 'Press CTRL + B'
+                                                        },
+                                                        {
+                                                                name : ' Italic command',
+                                                                legend : 'Press CTRL + I'
+                                                        },
+                                                        {
+                                                                name : ' Underline command',
+                                                                legend : 'Press CTRL + U'
+                                                        },
+                                                        {
+                                                                name : ' Link command',
+                                                                legend : 'Press CTRL + L'
+                                                        },
+                                                        {
+                                                                name : ' Toolbar Collapse command',
+                                                                legend : 'Press ALT + -'
+                                                        }
+                                                ]
+                        }
+                ]
         }
 });

CKEditor/branches/features/aria/_source/plugins/a11yhelp/plugin.js

@@ -12 +12 @@
         init : function( editor )
         {
-                var command = new CKEDITOR.dialogCommand( 'a11yHelp' );
-                command.modes = { wysiwyg:1, source:1 };
-                command.canUndo = false;
+                var plugin = this,
+                        pluginLang = ( plugin.lang = [] );
 
-                editor.addCommand( 'a11yHelp', command );
+                editor.addCommand( 'a11yHelp',
+                {
+                        exec :   function()
+                        {
+                                CKEDITOR.scriptLoader.load( CKEDITOR.getUrl( plugin.path + 'lang/default.js' ), function()
+                                        {
+                                                CKEDITOR.tools.extend( editor.lang, pluginLang[ editor.langCode ] || pluginLang[ 'en' ] );
+                                                editor.openDialog( 'a11yHelp' );
+                                        })      ;
+                        },
+                        modes : { wysiwyg:1, source:1 },
+                        canUndo : false
+                } );
+
                 CKEDITOR.dialog.add( 'a11yHelp', this.path + 'dialogs/a11yhelp.js' );
         }