vanilla ckeditor-3.4.2

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

diff --git a/_source/plugins/richcombo/plugin.js b/_source/plugins/richcombo/plugin.js
index 8c2e81b..bcc5777 100644 (file)
--- a/_source/plugins/richcombo/plugin.js
+++ b/_source/plugins/richcombo/plugin.js
@@ -130,7 +130,7 @@ CKEDITOR.ui.richCombo = CKEDITOR.tools.createClass(
                                        var element = CKEDITOR.document.getById( id ).getChild( 1 );\r
                                        element.focus();\r
                                },\r
-                               execute : clickFn\r
+                               clickFn : clickFn\r
                        };\r
 \r
                        editor.on( 'mode', function()\r
@@ -161,6 +161,9 @@ CKEDITOR.ui.richCombo = CKEDITOR.tools.createClass(
                                        ev.preventDefault();\r
                                });\r
 \r
+                       // For clean up\r
+                       instance.keyDownFn = keyDownFn;\r
+\r
                        output.push(\r
                                '<span class="cke_rcombo">',\r
                                '<span id=', id );\r
@@ -236,7 +239,7 @@ CKEDITOR.ui.richCombo = CKEDITOR.tools.createClass(
                                                me.onOpen();\r
                                };\r
 \r
-                       panel.onHide = function()\r
+                       panel.onHide = function( preventOnClose )\r
                                {\r
                                        if ( me.className )\r
                                                this.element.getFirst().removeClass( me.className + '_panel' );\r
@@ -245,7 +248,7 @@ CKEDITOR.ui.richCombo = CKEDITOR.tools.createClass(
 \r
                                        me._.on = 0;\r
 \r
-                                       if ( me.onClose )\r
+                                       if ( !preventOnClose && me.onClose )\r
                                                me.onClose();\r
                                };\r
 \r