vanilla ckeditor-3.6.3

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

diff --git a/_source/plugins/colorbutton/plugin.js b/_source/plugins/colorbutton/plugin.js
index 25e6ef4..7cc0604 100644 (file)
--- a/_source/plugins/colorbutton/plugin.js
+++ b/_source/plugins/colorbutton/plugin.js
@@ -1,5 +1,5 @@
 /*\r
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.\r
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.\r
 For licensing, see LICENSE.html or http://ckeditor.com/license\r
 */\r
 \r
@@ -93,8 +93,7 @@ CKEDITOR.plugins.add( 'colorbutton',
                function renderColors( panel, type, colorBoxId )\r
                {\r
                        var output = [],\r
-                               colors = config.colorButton_colors.split( ',' ),\r
-                               total = colors.length + ( config.colorButton_enableMore ? 2 : 1 );\r
+                               colors = config.colorButton_colors.split( ',' );\r
 \r
                        var clickFn = CKEDITOR.tools.addFunction( function( color, type )\r
                                {\r
@@ -157,7 +156,7 @@ CKEDITOR.plugins.add( 'colorbutton',
                                        ' title="', lang.auto, '"' +\r
                                        ' onclick="CKEDITOR.tools.callFunction(', clickFn, ',null,\'', type, '\');return false;"' +\r
                                        ' href="javascript:void(\'', lang.auto, '\')"' +\r
-                                       ' role="option" aria-posinset="1" aria-setsize="', total, '">' +\r
+                                       ' role="option">' +\r
                                        '<table role="presentation" cellspacing=0 cellpadding=0 width="100%">' +\r
                                                '<tr>' +\r
                                                        '<td>' +\r
@@ -194,7 +193,7 @@ CKEDITOR.plugins.add( 'colorbutton',
                                                        ' title="', colorLabel, '"' +\r
                                                        ' onclick="CKEDITOR.tools.callFunction(', clickFn, ',\'', colorName, '\',\'', type, '\'); return false;"' +\r
                                                        ' href="javascript:void(\'', colorLabel, '\')"' +\r
-                                                       ' role="option" aria-posinset="', ( i + 2 ), '" aria-setsize="', total, '">' +\r
+                                                       ' role="option">' +\r
                                                        '<span class="cke_colorbox" style="background-color:#', colorCode, '"></span>' +\r
                                                '</a>' +\r
                                        '</td>' );\r
@@ -211,7 +210,7 @@ CKEDITOR.plugins.add( 'colorbutton',
                                                                ' title="', lang.more, '"' +\r
                                                                ' onclick="CKEDITOR.tools.callFunction(', clickFn, ',\'?\',\'', type, '\');return false;"' +\r
                                                                ' href="javascript:void(\'', lang.more, '\')"',\r
-                                                               ' role="option" aria-posinset="', total, '" aria-setsize="', total, '">',\r
+                                                               ' role="option">',\r
                                                                lang.more,\r
                                                        '</a>' +\r
                                                '</td>' );      // tr is later in the code.\r