vanilla ckeditor-3.4.3

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

diff --git a/_source/plugins/richcombo/plugin.js b/_source/plugins/richcombo/plugin.js
index 8c2e81b..76523bc 100644 (file)
--- a/_source/plugins/richcombo/plugin.js
+++ b/_source/plugins/richcombo/plugin.js
@@ -106,11 +106,7 @@ CKEDITOR.ui.richCombo = CKEDITOR.tools.createClass(
                                                return;\r
                                        }\r
 \r
-                                       if ( !_.committed )\r
-                                       {\r
-                                               _.list.commit();\r
-                                               _.committed = 1;\r
-                                       }\r
+                                       !_.committed && this.commit();\r
 \r
                                        var value = this.getValue();\r
                                        if ( value )\r
@@ -130,7 +126,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 +157,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,16 +235,16 @@ 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
 \r
-                                       me.setState( CKEDITOR.TRISTATE_OFF );\r
+                                       me.setState( me.modes && me.modes[ editor.mode ] ? CKEDITOR.TRISTATE_OFF : CKEDITOR.TRISTATE_DISABLED );\r
 \r
                                        me._.on = 0;\r
 \r
-                                       if ( me.onClose )\r
+                                       if ( !preventOnClose && me.onClose )\r
                                                me.onClose();\r
                                };\r
 \r
@@ -347,6 +346,7 @@ CKEDITOR.ui.richCombo = CKEDITOR.tools.createClass(
                commit : function()\r
                {\r
                        this._.list.commit();\r
+                       this._.committed = 1;\r
                },\r
 \r
                setState : function( state )\r