vanilla ckeditor-3.4.3

[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 4f1db21..71a23a6 100644 (file)
--- a/_source/plugins/colordialog/dialogs/colordialog.js
+++ b/_source/plugins/colordialog/dialogs/colordialog.js
@@ -236,6 +236,7 @@ CKEDITOR.dialog.add( 'colordialog', function( editor )
 \r
                var table = new $el( 'table' );\r
                createColorTable();\r
+               var html = table.getHtml();\r
 \r
                var numbering = function( id )\r
                        {\r
@@ -270,12 +271,15 @@ CKEDITOR.dialog.add( 'colordialog', function( editor )
                                                        [\r
                                                                {\r
                                                                        type : 'html',\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
+                                                                       html :  '<table role="listbox" aria-labelledby="' + tableLabelId + '" onmouseout="CKEDITOR.tools.callFunction( ' + onMouseout + ' );">' +\r
+                                                                                       ( !CKEDITOR.env.webkit ? html : '' ) +\r
+                                                                               '</table><span id="' + tableLabelId + '" class="cke_voice_label">' + lang.options +'</span>',\r
                                                                        onLoad : function()\r
                                                                        {\r
                                                                                var table = CKEDITOR.document.getById( this.domId );\r
                                                                                table.on( 'mouseover', updateHighlight );\r
+                                                                               // In WebKit, the table content must be inserted after this event call (#6150)\r
+                                                                               CKEDITOR.env.webkit && table.setHtml( html );\r
                                                                        },\r
                                                                        focus: function()\r
                                                                        {\r