X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Fbutton%2Fplugin.js;h=c9284c8d8dd2831026ed609a6dc7b2d46570d0d6;hb=3fe9cac293e090ea459a3ee10d78cbe9e1dd0e03;hp=80c48c1c7725254c7665fabef54af2b086eb52a0;hpb=4e70ea24db840898be8cc21c950363a52a2a6aba;p=ckeditor.git

diff --git a/_source/plugins/button/plugin.js b/_source/plugins/button/plugin.js
index 80c48c1..c9284c8 100644
--- a/_source/plugins/button/plugin.js
+++ b/_source/plugins/button/plugin.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 
@@ -89,7 +89,11 @@ CKEDITOR.ui.button.prototype =
 			},
 			execute : function()
 			{
-				this.button.click( editor );
+				// IE 6 needs some time before execution (#7922)
+				if ( CKEDITOR.env.ie && CKEDITOR.env.version < 7 )
+					CKEDITOR.tools.setTimeout( function(){ this.button.click( editor ); }, 0, this );
+				else
+					this.button.click( editor );
 			}
 		};
 
@@ -206,8 +210,9 @@ CKEDITOR.ui.button.prototype =
 
 		output.push(
 					' onkeydown="return CKEDITOR.tools.callFunction(', keydownFn, ', event);"' +
-					' onfocus="return CKEDITOR.tools.callFunction(', focusFn,', event);"' +
-				' onclick="CKEDITOR.tools.callFunction(', clickFn, ', this); return false;">' +
+					' onfocus="return CKEDITOR.tools.callFunction(', focusFn,', event);" ' +
+					( CKEDITOR.env.ie ? 'onclick="return false;" onmouseup' : 'onclick' ) +		// #188
+						'="CKEDITOR.tools.callFunction(', clickFn, ', this); return false;">' +
 					'<span class="cke_icon"' );
 
 		if ( this.icon )