Ticket #3041: 3041.patch

_source/plugins/colorbutton/plugin.js

@@ -68 +68 @@
                         var output = [],
                                 colors = CKEDITOR.config.colorButton_colors.split( ',' );
 
-                        if ( !clickFn )
-                        {
-                                clickFn = CKEDITOR.tools.addFunction( function( color, type )
+                        clickFn = CKEDITOR.tools.addFunction( function( color, type )
+                                {
+                                        if ( color == '?' )
                                         {
-                                                if ( color == '?' )
-                                                {
-                                                        // TODO : Implement the colors dialog.
-                                                        // editor.openDialog( '' );
-                                                        return;
-                                                }
+                                                // TODO : Implement the colors dialog.
+                                                // editor.openDialog( '' );
+                                                return;
+                                        }
 
-                                                editor.focus();
+                                        editor.focus();
 
-                                                if ( saveRanges )
-                                                {
-                                                        editor.getSelection().selectRanges( saveRanges );
-                                                        saveRanges = false;
-                                                }
+                                        if ( saveRanges )
+                                        {
+                                                editor.getSelection().selectRanges( saveRanges );
+                                                saveRanges = false;
+                                        }
 
-                                                panel.hide();
+                                        panel.hide();
 
-                                                var style = new CKEDITOR.style( config['colorButton_' + type + 'Style'], { color : color || '#000' } );
+                                        var style = new CKEDITOR.style( config['colorButton_' + type + 'Style'], { color : color || '#000' } );
 
-                                                if ( color )
-                                                        style.apply( editor.document );
-                                                else
-                                                        style.remove( editor.document );
-                                        });
-                        }
+                                        if ( color )
+                                                style.apply( editor.document );
+                                        else
+                                                style.remove( editor.document );
+                                });
 
                         // Render the "Automatic" button.
                         output.push(