' style="cursor: pointer;display:block;width:100%;height:100% " title="'+ CKEDITOR.tools.htmlEncode( color )+ '"' +\r
' onkeydown="CKEDITOR.tools.callFunction( ' + onKeydownHandler + ', event, this )"' +\r
' onclick="CKEDITOR.tools.callFunction(' + onClickHandler + ', event, this ); return false;"' +\r
- ' tabindex="-1"><span class="cke_voice_label">' + color + '</span></a>', CKEDITOR.document ) );\r
+ ' tabindex="-1"><span class="cke_voice_label">' + color + '</span> </a>', CKEDITOR.document ) );\r
}\r
\r
appendColorRow( 0, 0 );\r
\r
var numbering = function( id )\r
{\r
- return id + CKEDITOR.tools.getNextNumber();\r
+ return CKEDITOR.tools.getNextId() + '_' + id;\r
},\r
hicolorId = numbering( 'hicolor' ),\r
hicolorTextId = numbering( 'hicolortext' ),\r
- selHiColorId = numbering( 'selhicolor' );\r
+ selHiColorId = numbering( 'selhicolor' ),\r
+ tableLabelId = numbering( 'color_table_label' );\r
\r
return {\r
title : lang.title,\r
[\r
{\r
type : 'html',\r
- html : '<table role="listbox" aria-labelledby="color_table_label" onmouseout="CKEDITOR.tools.callFunction( ' + onMouseout + ' );">' + table.getHtml() + '</table>' +\r
- '<span id="color_table_label" class="cke_voice_label">' + lang.options +'</span>',\r
+ html : '<table role="listbox" aria-labelledby="' + tableLabelId + '" onmouseout="CKEDITOR.tools.callFunction( ' + onMouseout + ' );">' + table.getHtml() + '</table>' +\r
+ '<span id="' + tableLabelId + '" class="cke_voice_label">' + lang.options +'</span>',\r
onLoad : function()\r
{\r
var table = CKEDITOR.document.getById( this.domId );\r