X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=_source%2Fplugins%2Flistblock%2Fplugin.js;h=e22956b895d678cd7477357265c112403e6ba88a;hb=e73319a12b56100b29ef456fd74114fe5519e01c;hp=8aa58ad81faee844743c7800b9ec9a9ee5182cb6;hpb=48b1db88210b4160dce439c6e3e32e14af8c106b;p=ckeditor.git
diff --git a/_source/plugins/listblock/plugin.js b/_source/plugins/listblock/plugin.js
index 8aa58ad..e22956b 100644
--- a/_source/plugins/listblock/plugin.js
+++ b/_source/plugins/listblock/plugin.js
@@ -36,7 +36,8 @@ CKEDITOR.plugins.add( 'listblock',
keys[ 9 ] = 'next'; // TAB
keys[ 38 ] = 'prev'; // ARROW-UP
keys[ CKEDITOR.SHIFT + 9 ] = 'prev'; // SHIFT + TAB
- keys[ 32 ] = 'click'; // SPACE
+ keys[ 32 ] = CKEDITOR.env.ie ? 'mouseup' : 'click'; // SPACE
+ CKEDITOR.env.ie && ( keys[ 13 ] = 'mouseup' ); // Manage ENTER, since onclick is blocked in IE (#8041).
this._.pendingHtml = [];
this._.items = {};
@@ -96,8 +97,9 @@ CKEDITOR.plugins.add( 'listblock',
'
' +
'',
html || value,
@@ -194,15 +196,19 @@ CKEDITOR.plugins.add( 'listblock',
item.addClass( 'cke_selected' );
this.element.getDocument().getById( itemId + '_option' ).setAttribute( 'aria-selected', true );
- this.element.setAttribute( 'aria-activedescendant', itemId + '_option' );
-
this.onMark && this.onMark( item );
},
unmark : function( value )
{
- this.element.getDocument().getById( this._.items[ value ] ).removeClass( 'cke_selected' );
- this.onUnmark && this.onUnmark( this._.items[ value ] );
+ var doc = this.element.getDocument(),
+ itemId = this._.items[ value ],
+ item = doc.getById( itemId );
+
+ item.removeClass( 'cke_selected' );
+ doc.getById( itemId + '_option' ).removeAttribute( 'aria-selected' );
+
+ this.onUnmark && this.onUnmark( item );
},
unmarkAll : function()
@@ -212,7 +218,10 @@ CKEDITOR.plugins.add( 'listblock',
for ( var value in items )
{
- doc.getById( items[ value ] ).removeClass( 'cke_selected' );
+ var itemId = items[ value ];
+
+ doc.getById( itemId ).removeClass( 'cke_selected' );
+ doc.getById( itemId + '_option' ).removeAttribute( 'aria-selected' );
}
this.onUnmark && this.onUnmark();