X-Git-Url: https://jasonwoof.com/gitweb/?p=ckeditor.git;a=blobdiff_plain;f=_source%2Fplugins%2Frichcombo%2Fplugin.js;h=1fa8f34b961a17023d8adf1c408e62d19fab6bab;hp=f79c1b31cc24f4534109e85a6391498808988f7d;hb=f0610347140239143439a511ee2bd48cb784f470;hpb=4e70ea24db840898be8cc21c950363a52a2a6aba

diff --git a/_source/plugins/richcombo/plugin.js b/_source/plugins/richcombo/plugin.js
index f79c1b3..1fa8f34 100644
--- a/_source/plugins/richcombo/plugin.js
+++ b/_source/plugins/richcombo/plugin.js
@@ -161,6 +161,8 @@ CKEDITOR.ui.richCombo = CKEDITOR.tools.createClass(
 					ev.preventDefault();
 				});
 
+			var focusFn = CKEDITOR.tools.addFunction( function() { instance.onfocus && instance.onfocus(); } );
+
 			// For clean up
 			instance.keyDownFn = keyDownFn;
 
@@ -197,7 +199,9 @@ CKEDITOR.ui.richCombo = CKEDITOR.tools.createClass(
 
 			output.push(
 					' onkeydown="CKEDITOR.tools.callFunction( ', keyDownFn, ', event, this );"' +
-					' 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>' +
 							'<span id="' + id + '_text" class="cke_text cke_inline_label">' + this.label + '</span>' +
 						'</span>' +
@@ -255,7 +259,6 @@ CKEDITOR.ui.richCombo = CKEDITOR.tools.createClass(
 			panel.onEscape = function()
 				{
 					panel.hide();
-					me.document.getById( 'cke_' + me.id ).getFirst().getNext().focus();
 				};
 
 			list.onClick = function( value, marked )
@@ -273,7 +276,7 @@ CKEDITOR.ui.richCombo = CKEDITOR.tools.createClass(
 					else
 						me.setValue( '' );
 
-					panel.hide();
+					panel.hide( false );
 				};
 
 			this._.panel = panel;