Ticket #4354: 4354.patch

_source/plugins/toolbar/plugin.js

@@ -59 +59 @@
                 {
                         var itemKeystroke = function( item, keystroke )
                         {
+                                function isDisabled( item )
+                                {
+                                        return item.id && CKEDITOR.document.getById( item.id ).hasClass( 'cke_disabled' );
+                                }
                                 switch ( keystroke )
                                 {
                                         case 39 :                                       // RIGHT-ARROW
                                         case 9 :                                        // TAB
                                                 // Look for the next item in the toolbar.
-                                                while ( ( item = item.next || ( item.toolbar.next && item.toolbar.next.items[ 0 ] ) ) && !item.focus )
+                                                // Jump to next toolbar if this one finishes.
+                                                // Skip non-focusable items (eg separators) and disabled ones also.
+                                                while ( ( item = item.next || ( item.toolbar.next && item.toolbar.next.items[ 0 ] ) ) && ( !item.focus || isDisabled( item ) ) )
                                                 { /*jsl:pass*/ }
 
                                                 // If available, just focus it, otherwise focus the
@@ -79 +85 @@
                                         case 37 :                                       // LEFT-ARROW
                                         case CKEDITOR.SHIFT + 9 :       // SHIFT + TAB
                                                 // Look for the previous item in the toolbar.
-                                                while ( ( item = item.previous || ( item.toolbar.previous && item.toolbar.previous.items[ item.toolbar.previous.items.length - 1 ] ) ) && !item.focus )
+                                                // Jump to previous toolbar if this one finishes.
+                                                // Skip non-focusable items (eg separators) and disabled ones also.
+                                                while ( ( item = item.previous || ( item.toolbar.previous && item.toolbar.previous.items[ item.toolbar.previous.items.length - 1 ] ) ) && ( !item.focus || isDisabled( item ) ) )
                                                 { /*jsl:pass*/ }
 
                                                 // If available, just focus it, otherwise focus the

CHANGES.html

@@ -48 +48 @@
                 <li><a href="http://dev.fckeditor.net/ticket/3528">#3528</a> : Fixed Context Menu issue when triggered using Shift+F10.</li>
                 <li><a href="http://dev.fckeditor.net/ticket/4028">#4028</a> : Maximize control's tool tip was wrong once it is maximized.</li>
                 <li><a href="http://dev.fckeditor.net/ticket/4237">#4237</a> : ToolBar is chopped off in Safari browser 3.x.</li>
-                <li><a href="http://dev.fckeditor.net/ticket/4269">#4269</a> : "Esc" and "Enter" keystrokes were not handled when a dialogue box is opened which causes the form post automatically.</li>               
+                <li><a href="http://dev.fckeditor.net/ticket/4269">#4269</a> : "Esc" and "Enter" keystrokes were not handled when a dialogue box is opened which causes the form post automatically.</li>
+                <li><a href="http://dev.fckeditor.net/ticket/4354">#4354</a> : Fixed TAB key on toolbar to not focus disabled buttons.</li>
         </ul>
         <h3>
                 CKEditor 3.0</h3>