Skip to content
Permalink
Browse files

Merge branch 't/10361b'

  • Loading branch information...
oleq committed May 29, 2013
2 parents 70fbb8d + a5cfb69 commit 1d781e4072ca1a8aa665deeaf39646a877e22497
Showing with 17 additions and 12 deletions.
  1. +1 −0 CHANGES.md
  2. +12 −9 plugins/listblock/plugin.js
  3. +2 −1 plugins/panel/plugin.js
  4. +2 −2 plugins/richcombo/plugin.js
@@ -13,6 +13,7 @@ CKEditor 4 Changelog
* [#10298](http://dev.ckeditor.com/ticket/10298): Data processor breaks attributes containing protected parts.
* [#9945](http://dev.ckeditor.com/ticket/9945): [iOS] Scrolling not possible on iPad.
* [#10165](http://dev.ckeditor.com/ticket/10165): [IE] Access denied error if document.domain has been altered.
* [#10361](http://dev.ckeditor.com/ticket/10361): ARIA role="application" should not be used for floating panels.

## CKEditor 4.1.1

@@ -205,24 +205,27 @@ CKEDITOR.plugins.add( 'listblock', {
focus: function( value ) {
this._.focusIndex = -1;

if ( value ) {
var selected = this.element.getDocument().getById( this._.items[ value ] ).getFirst();
var links = this.element.getElementsByTag( 'a' ),
link,
selected,
i = -1;

var links = this.element.getElementsByTag( 'a' ),
link,
i = -1;
if ( value ) {
selected = this.element.getDocument().getById( this._.items[ value ] ).getFirst();

while ( ( link = links.getItem( ++i ) ) ) {
if ( link.equals( selected ) ) {
this._.focusIndex = i;
break;
}
}

setTimeout( function() {
selected.focus();
}, 0 );
} else {
this.element.focus();
}

selected && setTimeout( function() {
selected.focus();
}, 0 );
}
}
});
@@ -267,7 +267,8 @@
attributes: {
'tabIndex': -1,
'class': 'cke_panel_block',
'role': 'presentation'
'role': 'presentation',
'tabindex': 0
},
styles: {
display: 'none'
@@ -249,14 +249,14 @@ CKEDITOR.plugins.add( 'richcombo', {

me.setState( CKEDITOR.TRISTATE_ON );

list.focus( !list.multiSelect && me.getValue() );

me._.on = 1;

me.editorFocus && editor.focus();

if ( me.onOpen )
me.onOpen();

list.focus( !list.multiSelect && me.getValue() );
};

panel.onHide = function( preventOnClose ) {

0 comments on commit 1d781e4

Please sign in to comment.
You can’t perform that action at this time.