Ticket #6150: 6150.patch

_source/plugins/colordialog/dialogs/colordialog.js

@@ -236 +236 @@
 
                 var table = new $el( 'table' );
                 createColorTable();
+                var html = table.getHtml();
 
                 var numbering = function( id )
                         {
@@ -270 +271 @@
                                                         [
                                                                 {
                                                                         type : 'html',
-                                                                        html : '<table role="listbox" aria-labelledby="' + tableLabelId + '" onmouseout="CKEDITOR.tools.callFunction( ' + onMouseout + ' );">' + table.getHtml() + '</table>' +
-                                                                                                '<span id="' + tableLabelId + '" class="cke_voice_label">' + lang.options +'</span>',
+                                                                        html :  '<table role="listbox" aria-labelledby="' + tableLabelId + '" onmouseout="CKEDITOR.tools.callFunction( ' + onMouseout + ' );">' +
+                                                                                        ( !CKEDITOR.env.webkit ? html : '' ) +
+                                                                                '</table><span id="' + tableLabelId + '" class="cke_voice_label">' + lang.options +'</span>',
                                                                         onLoad : function()
                                                                         {
                                                                                 var table = CKEDITOR.document.getById( this.domId );
                                                                                 table.on( 'mouseover', updateHighlight );
+                                                                                // In WebKit, the table content must be inserted after this event call (#6150)
+                                                                                CKEDITOR.env.webkit && table.setHtml( html );
                                                                         },
                                                                         focus: function()
                                                                         {