Changeset 5077

Timestamp:

02/09/10 17:41:03 (3 years ago)

Author:

garry.yao

Message:

Different way of loading a11yhelp language entires.

Location:

CKEditor/branches/features/aria/_source

Files:

• core/plugins.js (modified) (1 diff)
• plugins/a11yhelp/plugin.js (modified) (1 diff)
• plugins/keystrokes/plugin.js (modified) (1 diff)

CKEditor/branches/features/aria/_source/core/plugins.js

@@ -77 +77 @@
         });
 
-/**
- *  Used for lazy load an individual plugin's language file.
- * @param pluginName
- * @param callback
- */
-CKEDITOR.editor.prototype.loadPluginLang = function( pluginName,  callback )
-{
-
-        var plugin = CKEDITOR.plugins.get( pluginName ),
-                        langCode = this.langCode;
-
-        if( plugin.lang )
-                callback.apply( plugin );
-        else
-        {
-                CKEDITOR.scriptLoader.load(
-                                CKEDITOR.getUrl( plugin.path + 'lang/' + langCode + '.js' ),
-                                function()
-                                {
-                                        CKEDITOR.tools.extend( this.lang, plugin.lang[ langCode ] );
-                                        callback.apply( plugin, arguments );
-                                }, this )       ;
-        }
-};
-
 CKEDITOR.plugins.setLang = function( pluginName, languageCode, languageEntries )
 {

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

@@ -15 +15 @@
         CKEDITOR.plugins.add( pluginName,
         {
+                langs : [ 'en' ],
                 init : function( editor )
                 {
+                        var plugin = this;
                         editor.addCommand( commandName,
                                 {
                                         exec : function()
                                         {
-                                                editor.loadPluginLang( pluginName, function()
-                                                        {
-                                                                editor.openDialog( commandName );
-                                                        });
+                                                var langCode = ( CKEDITOR.tools.indexOf( plugin.langs, editor.langCode ) >= 0 ?
+                                                        editor.langCode : plugin.langs[ 0 ] );
+
+                                                CKEDITOR.scriptLoader.load(
+                                                                CKEDITOR.getUrl( plugin.path + 'lang/' + langCode + '.js' ),
+                                                                function()
+                                                                {
+                                                                        CKEDITOR.tools.extend( editor.lang, plugin.lang[ langCode ] );
+                                                                        editor.openDialog( commandName );
+                                                                })      ;
                                         },
                                         modes : { wysiwyg:1, source:1 },

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

@@ -215 +215 @@
         [ CKEDITOR.CTRL + 85 /*U*/, 'underline' ],
 
-        [ CKEDITOR.ALT + 109 /*-*/, 'toolbarCollapse' ]
+        [ CKEDITOR.ALT + 109 /*-*/, 'toolbarCollapse' ],
+        [ CKEDITOR.ALT + 48 /*-*/, 'a11yHelp' ]
 ];