Skip to content

Commit

Permalink
Merge branch 't/11125c'
Browse files Browse the repository at this point in the history
  • Loading branch information
fredck committed Dec 4, 2013
2 parents 35c31bc + ca0cdb2 commit 6378c87
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ Fixed Issues:
* [#10055](http://dev.ckeditor.com/ticket/10055): [IE8-10] Fixed: *Delete* pressed on selected image causes browser to go back.
* [#11183](http://dev.ckeditor.com/ticket/11183): Fixed: Inserting line or table in multiple rows selection causes browser crash. Additionally, the [`editor.insertElement`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-insertElement) method does not insert element into every range of a selection any more.
* [#11042](http://dev.ckeditor.com/ticket/11042): Fixed: Selection made on element containing non-editable element was not auto faked.
* [#11042](http://dev.ckeditor.com/ticket/11125): Fixed: Keyboard navigation through menu and combo items will now cycle.


## CKEditor 4.3
Expand Down
20 changes: 19 additions & 1 deletion plugins/panel/plugin.js
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@
this.element.setStyle( 'display', 'none' );
},

onKeyDown: function( keystroke ) {
onKeyDown: function( keystroke, noCycle ) {
var keyAction = this.keys[ keystroke ];
switch ( keyAction ) {
// Move forward.
Expand All @@ -339,6 +339,13 @@
break;
}
}

// If no link was found, cycle and restart from the top. (#11125)
if ( !link && !noCycle ) {
this._.focusIndex = -1;
return this.onKeyDown( keystroke, 1 );
}

return false;

// Move backward.
Expand All @@ -355,7 +362,18 @@
link.focus();
break;
}

// Make sure link is null when the loop ends and nothing was
// found (#11125).
link = null;
}

// If no link was found, cycle and restart from the bottom. (#11125)
if ( !link && !noCycle ) {
this._.focusIndex = links.count();
return this.onKeyDown( keystroke, 1 );
}

return false;

case 'click':
Expand Down

0 comments on commit 6378c87

Please sign in to comment.