Changeset 6141

Timestamp:

11/30/10 18:15:49 (2 years ago)

Author:

Saare

Message:

#6150: Select color dialog is broken in Safari 3.

Location:

CKEditor/trunk

Files:

• CHANGES.html (modified) (1 diff)
• _source/plugins/colordialog/dialogs/colordialog.js (modified) (2 diffs)

CKEditor/trunk/CHANGES.html

@@ -66 +66 @@
                 <li><a href="http://dev.ckeditor.com/ticket/5894">#5894</a> : Custom buttons added at bottom of dialogs don't expand to include their contents.</li>
                 <li><a href="http://dev.ckeditor.com/ticket/6513">#6513</a> : Wrong ARIA attributes created on list options of "Styles" rich combo.</li>
+                <li><a href="http://dev.ckeditor.com/ticket/6150">#6150</a> : [Safari] Color dialog was broken.</li>
         </ul>
         <h3>

CKEditor/trunk/_source/plugins/colordialog/dialogs/colordialog.js

@@ -237 +237 @@
                 var table = new $el( 'table' );
                 createColorTable();
+                var html = table.getHtml();
 
                 var numbering = function( id )
@@ -271 +272 @@
                                                                 {
                                                                         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()