vanilla ckeditor-3.6.1

[ckeditor.git] / _source / plugins / listblock / plugin.js

diff --git a/_source/plugins/listblock/plugin.js b/_source/plugins/listblock/plugin.js
index 848cc2a..e4898a5 100644 (file)
--- a/_source/plugins/listblock/plugin.js
+++ b/_source/plugins/listblock/plugin.js
@@ -1,5 +1,5 @@
 /*\r
-Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.\r
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.\r
 For licensing, see LICENSE.html or http://ckeditor.com/license\r
 */\r
 \r
@@ -9,9 +9,9 @@ CKEDITOR.plugins.add( 'listblock',
 \r
        onLoad : function()\r
        {\r
-               CKEDITOR.ui.panel.prototype.addListBlock = function( name, definiton )\r
+               CKEDITOR.ui.panel.prototype.addListBlock = function( name, definition )\r
                {\r
-                       return this.addBlock( name, new CKEDITOR.ui.listBlock( this.getHolderElement(), definiton ) );\r
+                       return this.addBlock( name, new CKEDITOR.ui.listBlock( this.getHolderElement(), definition ) );\r
                };\r
 \r
                CKEDITOR.ui.listBlock = CKEDITOR.tools.createClass(\r
@@ -36,7 +36,8 @@ CKEDITOR.plugins.add( 'listblock',
                                        keys[ 9 ]       = 'next';                                       // TAB\r
                                        keys[ 38 ]      = 'prev';                                       // ARROW-UP\r
                                        keys[ CKEDITOR.SHIFT + 9 ]      = 'prev';       // SHIFT + TAB\r
-                                       keys[ 32 ]      = 'click';                                      // SPACE\r
+                                       keys[ 32 ]      = CKEDITOR.env.ie ? 'mouseup' : 'click';                                        // SPACE\r
+                                       CKEDITOR.env.ie && ( keys[ 13 ] = 'mouseup' );          // Manage ENTER, since onclick is blocked in IE (#8041).\r
 \r
                                        this._.pendingHtml = [];\r
                                        this._.items = {};\r
@@ -81,7 +82,7 @@ CKEDITOR.plugins.add( 'listblock',
                                        add : function( value, html, title )\r
                                        {\r
                                                var pendingHtml = this._.pendingHtml,\r
-                                                       id = 'cke_' + CKEDITOR.tools.getNextNumber();\r
+                                                       id = CKEDITOR.tools.getNextId();\r
 \r
                                                if ( !this._.started )\r
                                                {\r
@@ -93,11 +94,12 @@ CKEDITOR.plugins.add( 'listblock',
                                                this._.items[ value ] = id;\r
 \r
                                                pendingHtml.push(\r
-                                                       '<li id=', id, ' class=cke_panel_listItem>' +\r
+                                                       '<li id=', id, ' class=cke_panel_listItem role=presentation>' +\r
                                                                '<a id="', id, '_option" _cke_focus=1 hidefocus=true' +\r
                                                                        ' title="', title || value, '"' +\r
-                                                                       ' href="javascript:void(\'', value, '\')"' +\r
-                                                                       ' onclick="CKEDITOR.tools.callFunction(', this._.getClick(), ',\'', value, '\'); return false;"',\r
+                                                                       ' href="javascript:void(\'', value, '\')" ' +\r
+                                                                       ( CKEDITOR.env.ie ? 'onclick="return false;" onmouseup' : 'onclick' ) +         // #188\r
+                                                                               '="CKEDITOR.tools.callFunction(', this._.getClick(), ',\'', value, '\'); return false;"',\r
                                                                        ' role="option"' +\r
                                                                        ' aria-posinset="' + ++this._.size + '">',\r
                                                                        html || value,\r
@@ -109,7 +111,7 @@ CKEDITOR.plugins.add( 'listblock',
                                        {\r
                                                this._.close();\r
 \r
-                                               var id = 'cke_' + CKEDITOR.tools.getNextNumber();\r
+                                               var id = CKEDITOR.tools.getNextId();\r
 \r
                                                this._.groups[ title ] = id;\r
 \r
@@ -195,11 +197,20 @@ CKEDITOR.plugins.add( 'listblock',
 \r
                                                this.element.getDocument().getById( itemId + '_option' ).setAttribute( 'aria-selected', true );\r
                                                this.element.setAttribute( 'aria-activedescendant', itemId + '_option' );\r
+\r
+                                               this.onMark && this.onMark( item );\r
                                        },\r
 \r
                                        unmark : function( value )\r
                                        {\r
-                                               this.element.getDocument().getById( this._.items[ value ] ).removeClass( 'cke_selected' );\r
+                                               var doc = this.element.getDocument(),\r
+                                                       itemId = this._.items[ value ],\r
+                                                       item = doc.getById( itemId );\r
+\r
+                                               item.removeClass( 'cke_selected' );\r
+                                               doc.getById( itemId + '_option' ).removeAttribute( 'aria-selected' );\r
+\r
+                                               this.onUnmark && this.onUnmark( item );\r
                                        },\r
 \r
                                        unmarkAll : function()\r
@@ -209,8 +220,13 @@ CKEDITOR.plugins.add( 'listblock',
 \r
                                                for ( var value in items )\r
                                                {\r
-                                                       doc.getById( items[ value ] ).removeClass( 'cke_selected' );\r
+                                                       var itemId = items[ value ];\r
+\r
+                                                       doc.getById( itemId ).removeClass( 'cke_selected' );\r
+                                                       doc.getById( itemId + '_option' ).removeAttribute( 'aria-selected' );\r
                                                }\r
+\r
+                                               this.onUnmark && this.onUnmark();\r
                                        },\r
 \r
                                        isMarked : function( value )\r