vanilla ckeditor-3.5.1

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

diff --git a/_source/plugins/richcombo/plugin.js b/_source/plugins/richcombo/plugin.js
index d7895c8..7978abe 100644 (file)
--- a/_source/plugins/richcombo/plugin.js
+++ b/_source/plugins/richcombo/plugin.js
@@ -1,5 +1,5 @@
 /*\r
-Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.\r
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.\r
 For licensing, see LICENSE.html or http://ckeditor.com/license\r
 */\r
 \r
@@ -131,6 +131,7 @@ CKEDITOR.ui.richCombo = CKEDITOR.tools.createClass(
                        editor.on( 'mode', function()\r
                                {\r
                                        this.setState( this.modes[ editor.mode ] ? CKEDITOR.TRISTATE_OFF : CKEDITOR.TRISTATE_DISABLED );\r
+                                       this.setValue( '' );\r
                                },\r
                                this );\r
 \r
@@ -289,16 +290,18 @@ CKEDITOR.ui.richCombo = CKEDITOR.tools.createClass(
                        this._.value = value;\r
 \r
                        var textElement = this.document.getById( 'cke_' + this.id + '_text' );\r
-\r
-                       if ( !( value || text ) )\r
+                       if ( textElement )\r
                        {\r
-                               text = this.label;\r
-                               textElement.addClass( 'cke_inline_label' );\r
-                       }\r
-                       else\r
-                               textElement.removeClass( 'cke_inline_label' );\r
+                               if ( !( value || text ) )\r
+                               {\r
+                                       text = this.label;\r
+                                       textElement.addClass( 'cke_inline_label' );\r
+                               }\r
+                               else\r
+                                       textElement.removeClass( 'cke_inline_label' );\r
 \r
-                       textElement.setHtml( typeof text != 'undefined' ? text : value );\r
+                               textElement.setHtml( typeof text != 'undefined' ? text : value );\r
+                       }\r
                },\r
 \r
                getValue : function()\r