Changeset 5068

Timestamp:

2010-02-09 16:15:42 (6 weeks ago)

Author:

garry.yao

Message:

1. Introduce customizable initial dialog focus via 'dialogDefinition.onFocus';
2. 'html' type field focuable with 'elementDefinition.focus = true';

Location:

CKEditor/branches/features/aria/_source/plugins

Files:

• dialog/plugin.js (modified) (1 diff)
• dialogui/plugin.js (modified) (2 diffs)
• link/dialogs/link.js (modified) (3 diffs)

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

@@ -422 +422 @@
                                         this._.currentFocusIndex = -1;
                                         setupFocus();
-                                        changeFocus( true );
+
+                                        // Decide where to put the initial focus.
+                                        if ( definition.onFocus )
+                                        {
+                                                var initialFocus = definition.onFocus.call( this );
+                                                // Focus the field that the user specified.
+                                                initialFocus && initialFocus.focus();
+                                        }
+                                        // Focus the first field in layout order.
+                                        else
+                                                changeFocus( true );
+
                                         /*
                                          * IE BUG: If the initial focus went into a non-text element (e.g. button),

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

@@ -768 +768 @@
 
                                         // Look for focus function in definition.
-                                        if ( elementDefinition.focus )
+                                        var focus = elementDefinition.focus;
+                                        if ( focus )
                                         {
                                                 var oldFocus = this.focus;
@@ -774 +775 @@
                                                 {
                                                         oldFocus.call( this );
-                                                        elementDefinition.focus.call( this );
+                                                        typeof focus == 'function' && focus.call( this );
                                                         this.fire( 'focus' );
                                                 };

CKEditor/branches/features/aria/_source/plugins/link/dialogs/link.js

@@ -476 +476 @@
                                                                                         this.allowOnChange = true;
 
-                                                                                        // Raise the tab order of this field to top in case of URL.
-                                                                                        var linkType = this.getDialog().getContentElement( 'info', 'linkType' );
-                                                                                        if ( linkType && linkType.getValue() == 'url' )
-                                                                                                this.tabIndex = 1;
-
                                                                                 },
                                                                                 commit : function( data )
@@ -615 +610 @@
                                                                 style : 'text-align: center;',
                                                                 html : '<div role="label" tabIndex="-1">' + CKEDITOR.tools.htmlEncode( editor.lang.link.noAnchors ) + '</div>',
-                                                                focus : function(){},
+                                                                // Focus the first element defined in above html. 
+                                                                focus : true,
                                                                 setup : function( data )
                                                                 {
@@ -1365 +1361 @@
                                 this.hidePage( 'target' );              //Hide Target tab.
 
+                },
+                // Inital focus on 'url' field if link is of type URL.
+                onFocus : function()
+                {
+                        var linkType = this.getContentElement( 'info', 'linkType' );
+                        if ( linkType && linkType.getValue() == 'url' )
+                                return this.getContentElement( 'info', 'url' );
                 }
         };