Changeset 7364

Timestamp:

02/16/12 15:07:21 (15 months ago)

Author:

Reinmar

Message:

#8699 Move focus to clicked button and back to colorpicker dialog opener after dialog is closed.

Location:

CKEditor/trunk

Files:

• CHANGES.html (modified) (1 diff)
• _source/plugins/clipboard/dialogs/paste.js (modified) (1 diff)
• _source/plugins/dialog/plugin.js (modified) (7 diffs)
• _source/plugins/dialogui/plugin.js (modified) (1 diff)
• _source/plugins/tabletools/dialogs/tableCell.js (modified) (1 diff)

CKEditor/trunk/CHANGES.html

@@ -47 +47 @@
                 <li><a href="http://dev.ckeditor.com/ticket/8333">#8333</a> : Allow to close the dialogs with Esc key even if there's no Cancel button.</li>
                 <li><a href="http://dev.ckeditor.com/ticket/8644">#8644</a> : Missing variable declaration in the dialog plugin.</li>
+                <li><a href="http://dev.ckeditor.com/ticket/8699">#8699</a> : Now focus is moved to clicked button in all browsers and back to colorpicker dialog opener (button) after dialog is closed.</li>
         </ul>
         <h3>

CKEditor/trunk/_source/plugins/clipboard/dialogs/paste.js

@@ -46 +46 @@
                                 case 9 :
                                 case CKEDITOR.SHIFT + 9 :
-                                        this.changeFocus( true );
+                                        this.changeFocus( 1 );
                                         processed = 1;
                         }

CKEditor/trunk/_source/plugins/dialog/plugin.js

@@ -361 +361 @@
                 }
 
-                function changeFocus( forward )
-                {
-                        var focusList = me._.focusList,
-                                offset = forward ? 1 : -1;
+                function changeFocus( offset )
+                {
+                        var focusList = me._.focusList;
+                        offset = offset || 0;
+
                         if ( focusList.length < 1 )
                                 return;
@@ -377 +378 @@
                         }
                         catch( e ){}
-
+                
                         var startIndex = ( current + offset + focusList.length ) % focusList.length,
                                 currentIndex = startIndex;
-                        while ( !focusList[ currentIndex ].isFocusable() )
+                        while ( offset && !focusList[ currentIndex ].isFocusable() )
                         {
                                 currentIndex = ( currentIndex + offset + focusList.length ) % focusList.length;
@@ -386 +387 @@
                                         break;
                         }
+                        
                         focusList[ currentIndex ].focus();
 
@@ -421 +423 @@
                                 {
                                         // Change the focus of inputs.
-                                        changeFocus( !shiftPressed );
+                                        changeFocus( shiftPressed ? -1 : 1 );
                                 }
 
@@ -446 +448 @@
                                 this._.tabBarMode = false;
                                 this._.currentFocusIndex = -1;
-                                changeFocus( true );
+                                changeFocus( 1 );
                                 processed = 1;
                         }
@@ -514 +516 @@
                                         // Focus the first field in layout order.
                                         else
-                                                changeFocus( true );
+                                                changeFocus( 1 );
 
                                         /*
@@ -580 +582 @@
                                                         this._.tabBarMode = false;
                                                         this._.currentFocusIndex = -1;
-                                                        changeFocus( true );
+                                                        changeFocus( 1 );
                                                 }
                                                 evt.data.preventDefault();

CKEditor/trunk/_source/plugins/dialogui/plugin.js

@@ -971 +971 @@
                                                 /** @ignore */
                                                 onClick : function( dialog, func )
-                                                {
-                                                        this.on( 'click', func );
+                                                {       
+                                                        this.on( 'click', function()
+                                                                {
+                                                                        // Some browsers (Chrome, IE8, IE7 compat mode) don't move
+                                                                        // focus to clicked button. Force this.
+                                                                        this.getElement().focus();
+                                                                        func.apply( this, arguments );
+                                                                });
                                                 }
                                         }, true ),

CKEditor/trunk/_source/plugins/tabletools/dialogs/tableCell.js

@@ -27 +27 @@
                                 releaseHandlers( this );
                                 callback( this, this._.parentDialog );
-                                this._.parentDialog.changeFocus( true );
+                                this._.parentDialog.changeFocus();
                         };
                         var onCancel = function()