Index: /CKEditor/trunk/_source/plugins/colorbutton/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/colorbutton/plugin.js	(revision 3322)
+++ /CKEditor/trunk/_source/plugins/colorbutton/plugin.js	(revision 3323)
@@ -13,6 +13,5 @@
 			lang = editor.lang.colorButton;
 
-		var saveRanges,
-			clickFn;
+		var saveRanges;
 
 		addButton( 'TextColor', 'fore', lang.textColorTitle );
@@ -69,33 +68,30 @@
 				colors = CKEDITOR.config.colorButton_colors.split( ',' );
 
-			if ( !clickFn )
-			{
-				clickFn = CKEDITOR.tools.addFunction( function( color, type )
+			var 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.