vanilla ckeditor-3.4b

[ckeditor.git] / _source / plugins / colordialog / dialogs / colordialog.js

diff --git a/_source/plugins/colordialog/dialogs/colordialog.js b/_source/plugins/colordialog/dialogs/colordialog.js
index 3259e7f..4454d19 100644 (file)
--- a/_source/plugins/colordialog/dialogs/colordialog.js
+++ b/_source/plugins/colordialog/dialogs/colordialog.js
@@ -243,11 +243,12 @@ CKEDITOR.dialog.add( 'colordialog', function( editor )
 \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
@@ -273,8 +274,8 @@ CKEDITOR.dialog.add( 'colordialog', function( editor )
                                                        [\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