vanilla ckeditor-3.6.1

[ckeditor.git] / _source / plugins / richcombo / plugin.js

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